summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-inst/contrib/arfile.h5
-rw-r--r--apt-inst/contrib/extracttar.cc5
-rw-r--r--apt-inst/contrib/extracttar.h11
-rw-r--r--apt-inst/deb/debfile.cc8
-rw-r--r--apt-inst/deb/debfile.h12
-rw-r--r--apt-inst/dirstream.h12
-rw-r--r--apt-pkg/acquire-item.cc2974
-rw-r--r--apt-pkg/acquire-item.h868
-rw-r--r--apt-pkg/acquire-method.cc25
-rw-r--r--apt-pkg/acquire-method.h14
-rw-r--r--apt-pkg/acquire-worker.cc372
-rw-r--r--apt-pkg/acquire-worker.h4
-rw-r--r--apt-pkg/acquire.cc163
-rw-r--r--apt-pkg/acquire.h55
-rw-r--r--apt-pkg/algorithms.cc14
-rw-r--r--apt-pkg/algorithms.h16
-rw-r--r--apt-pkg/aptconfiguration.h21
-rw-r--r--apt-pkg/cachefile.h1
-rw-r--r--apt-pkg/cacheiterators.h58
-rw-r--r--apt-pkg/cacheset.cc65
-rw-r--r--apt-pkg/cacheset.h144
-rw-r--r--apt-pkg/cdrom.cc36
-rw-r--r--apt-pkg/cdrom.h11
-rw-r--r--apt-pkg/clean.cc3
-rw-r--r--apt-pkg/clean.h2
-rw-r--r--apt-pkg/contrib/cdromutl.cc31
-rw-r--r--apt-pkg/contrib/cmndline.cc3
-rw-r--r--apt-pkg/contrib/cmndline.h1
-rw-r--r--apt-pkg/contrib/configuration.cc20
-rw-r--r--apt-pkg/contrib/configuration.h5
-rw-r--r--apt-pkg/contrib/fileutl.cc22
-rw-r--r--apt-pkg/contrib/fileutl.h13
-rw-r--r--apt-pkg/contrib/hashes.cc132
-rw-r--r--apt-pkg/contrib/hashes.h48
-rw-r--r--apt-pkg/contrib/macros.h19
-rw-r--r--apt-pkg/contrib/sha2_internal.cc9
-rw-r--r--apt-pkg/contrib/strutl.cc153
-rw-r--r--apt-pkg/contrib/strutl.h3
-rw-r--r--apt-pkg/deb/debindexfile.cc525
-rw-r--r--apt-pkg/deb/debindexfile.h103
-rw-r--r--apt-pkg/deb/deblistparser.cc49
-rw-r--r--apt-pkg/deb/deblistparser.h26
-rw-r--r--apt-pkg/deb/debmetaindex.cc602
-rw-r--r--apt-pkg/deb/debmetaindex.h31
-rw-r--r--apt-pkg/deb/debrecords.cc115
-rw-r--r--apt-pkg/deb/debrecords.h50
-rw-r--r--apt-pkg/deb/debsrcrecords.cc58
-rw-r--r--apt-pkg/deb/debsrcrecords.h9
-rw-r--r--apt-pkg/deb/debsystem.cc2
-rw-r--r--apt-pkg/deb/debversion.h1
-rw-r--r--apt-pkg/deb/dpkgpm.cc170
-rw-r--r--apt-pkg/depcache.cc77
-rw-r--r--apt-pkg/depcache.h10
-rw-r--r--apt-pkg/edsp.cc132
-rw-r--r--apt-pkg/edsp.h42
-rw-r--r--apt-pkg/edsp/edspindexfile.cc11
-rw-r--r--apt-pkg/edsp/edspindexfile.h3
-rw-r--r--apt-pkg/edsp/edsplistparser.cc6
-rw-r--r--apt-pkg/edsp/edsplistparser.h8
-rw-r--r--apt-pkg/edsp/edspsystem.cc4
-rw-r--r--apt-pkg/edsp/edspsystem.h6
-rw-r--r--apt-pkg/indexcopy.cc140
-rw-r--r--apt-pkg/indexcopy.h30
-rw-r--r--apt-pkg/indexfile.cc132
-rw-r--r--apt-pkg/indexfile.h80
-rw-r--r--apt-pkg/indexrecords.cc56
-rw-r--r--apt-pkg/indexrecords.h21
-rw-r--r--apt-pkg/init.cc26
-rw-r--r--apt-pkg/install-progress.cc6
-rw-r--r--apt-pkg/install-progress.h11
-rw-r--r--apt-pkg/metaindex.cc57
-rw-r--r--apt-pkg/metaindex.h34
-rw-r--r--apt-pkg/orderlist.h4
-rw-r--r--apt-pkg/packagemanager.cc52
-rw-r--r--apt-pkg/packagemanager.h14
-rw-r--r--apt-pkg/pkgcache.cc138
-rw-r--r--apt-pkg/pkgcache.h177
-rw-r--r--apt-pkg/pkgcachegen.cc266
-rw-r--r--apt-pkg/pkgcachegen.h37
-rw-r--r--apt-pkg/pkgrecords.cc3
-rw-r--r--apt-pkg/pkgrecords.h15
-rw-r--r--apt-pkg/pkgsystem.cc2
-rw-r--r--apt-pkg/pkgsystem.h5
-rw-r--r--apt-pkg/policy.cc83
-rw-r--r--apt-pkg/policy.h5
-rw-r--r--apt-pkg/sourcelist.cc2
-rw-r--r--apt-pkg/sourcelist.h28
-rw-r--r--apt-pkg/srcrecords.cc31
-rw-r--r--apt-pkg/srcrecords.h20
-rw-r--r--apt-pkg/tagfile-order.c109
-rw-r--r--apt-pkg/tagfile.cc332
-rw-r--r--apt-pkg/tagfile.h83
-rw-r--r--apt-pkg/upgrade.cc28
-rw-r--r--apt-pkg/upgrade.h13
-rw-r--r--apt-pkg/vendorlist.cc10
-rw-r--r--apt-pkg/version.cc3
-rw-r--r--apt-pkg/version.h2
-rw-r--r--apt-pkg/versionmatch.cc45
-rw-r--r--apt-pkg/versionmatch.h4
-rw-r--r--apt-private/acqprogress.cc244
-rw-r--r--apt-private/acqprogress.h9
-rw-r--r--apt-private/private-cmndline.cc40
-rw-r--r--apt-private/private-cmndline.h6
-rw-r--r--apt-private/private-install.cc8
-rw-r--r--apt-private/private-output.cc8
-rw-r--r--apt-private/private-output.h3
-rw-r--r--apt-private/private-show.cc46
-rw-r--r--apt-private/private-update.cc4
-rw-r--r--buildlib/config.h.in3
-rw-r--r--cmdline/apt-cache.cc80
-rw-r--r--cmdline/apt-cdrom.cc24
-rw-r--r--cmdline/apt-config.cc20
-rw-r--r--cmdline/apt-dump-solver.cc3
-rw-r--r--cmdline/apt-extracttemplates.cc33
-rw-r--r--cmdline/apt-get.cc434
-rw-r--r--cmdline/apt-helper.cc57
-rw-r--r--cmdline/apt-internal-solver.cc20
-rw-r--r--cmdline/apt-key.in2
-rw-r--r--cmdline/apt-mark.cc112
-rw-r--r--cmdline/apt-sortpkgs.cc41
-rw-r--r--cmdline/apt.cc23
-rw-r--r--cmdline/makefile8
-rw-r--r--configure.ac4
-rw-r--r--debian/apt.auto-removal.sh2
-rw-r--r--debian/changelog115
-rw-r--r--debian/libapt-pkg4.15.symbols431
-rw-r--r--debian/tests/run-tests2
-rw-r--r--doc/acquire-additional-files.txt229
-rw-r--r--doc/apt-get.8.xml31
-rw-r--r--doc/apt-verbatim.ent10
-rw-r--r--doc/apt.conf.5.xml27
-rw-r--r--doc/examples/configure-index11
-rw-r--r--doc/po/apt-doc.pot4
-rw-r--r--doc/po/fr.po436
-rw-r--r--doc/po/it.po205
-rw-r--r--ftparchive/apt-ftparchive.cc92
-rw-r--r--ftparchive/cachedb.cc10
-rw-r--r--ftparchive/contents.cc34
-rw-r--r--ftparchive/contents.h7
-rw-r--r--ftparchive/makefile4
-rw-r--r--ftparchive/multicompress.cc19
-rw-r--r--ftparchive/multicompress.h2
-rw-r--r--ftparchive/sources.cc41
-rw-r--r--ftparchive/sources.h26
-rw-r--r--ftparchive/writer.cc225
-rw-r--r--ftparchive/writer.h45
-rw-r--r--methods/cdrom.cc5
-rw-r--r--methods/copy.cc20
-rw-r--r--methods/file.cc87
-rw-r--r--methods/ftp.cc18
-rw-r--r--methods/gpgv.cc31
-rw-r--r--methods/gzip.cc2
-rw-r--r--methods/http.cc32
-rw-r--r--methods/http.h2
-rw-r--r--methods/https.cc184
-rw-r--r--methods/https.h30
-rw-r--r--methods/rred.cc130
-rw-r--r--methods/rsh.cc2
-rw-r--r--methods/server.cc82
-rw-r--r--methods/server.h15
-rw-r--r--po/apt-all.pot1695
-rw-r--r--po/ar.po1743
-rw-r--r--po/ast.po1825
-rw-r--r--po/bg.po1851
-rw-r--r--po/bs.po1735
-rw-r--r--po/ca.po1833
-rw-r--r--po/cs.po1823
-rw-r--r--po/cy.po1814
-rw-r--r--po/da.po1816
-rw-r--r--po/de.po1866
-rw-r--r--po/dz.po1778
-rw-r--r--po/el.po1789
-rw-r--r--po/es.po2435
-rw-r--r--po/eu.po1776
-rw-r--r--po/fi.po1779
-rw-r--r--po/fr.po2009
-rw-r--r--po/gl.po1837
-rw-r--r--po/he.po19
-rw-r--r--po/hu.po1839
-rw-r--r--po/it.po1963
-rw-r--r--po/ja.po1835
-rw-r--r--po/km.po1775
-rw-r--r--po/ko.po1801
-rw-r--r--po/ku.po1739
-rw-r--r--po/lt.po1759
-rw-r--r--po/mr.po1786
-rw-r--r--po/nb.po1807
-rw-r--r--po/ne.po1780
-rw-r--r--po/nl.po2596
-rw-r--r--po/nn.po1787
-rw-r--r--po/pl.po1833
-rw-r--r--po/pt.po1835
-rw-r--r--po/pt_BR.po1802
-rw-r--r--po/ro.po1796
-rw-r--r--po/ru.po1849
-rw-r--r--po/sk.po1815
-rw-r--r--po/sl.po1831
-rw-r--r--po/sv.po1817
-rw-r--r--po/th.po1788
-rw-r--r--po/tl.po1785
-rw-r--r--po/tr.po1855
-rw-r--r--po/uk.po1843
-rw-r--r--po/vi.po1826
-rw-r--r--po/zh_CN.po2067
-rw-r--r--po/zh_TW.po1770
-rwxr-xr-xprepare-release10
-rw-r--r--test/integration/framework339
-rwxr-xr-xtest/integration/skip-aptwebserver25
-rwxr-xr-xtest/integration/test-00-commands-have-help63
-rwxr-xr-xtest/integration/test-acquire-same-file-multiple-times80
-rwxr-xr-xtest/integration/test-acquire-same-repository-multiple-times81
-rwxr-xr-xtest/integration/test-allow-scores-for-all-dependency-types49
-rwxr-xr-xtest/integration/test-apt-acquire-additional-files95
-rwxr-xr-xtest/integration/test-apt-by-hash-update14
-rwxr-xr-xtest/integration/test-apt-cache124
-rwxr-xr-xtest/integration/test-apt-cdrom32
-rwxr-xr-xtest/integration/test-apt-cli-list21
-rwxr-xr-xtest/integration/test-apt-cli-search25
-rwxr-xr-xtest/integration/test-apt-cli-show19
-rwxr-xr-xtest/integration/test-apt-cli-update9
-rwxr-xr-xtest/integration/test-apt-cli-upgrade6
-rwxr-xr-xtest/integration/test-apt-config36
-rwxr-xr-xtest/integration/test-apt-download-progress42
-rwxr-xr-xtest/integration/test-apt-extracttemplates69
-rwxr-xr-xtest/integration/test-apt-ftparchive-cachedb46
-rwxr-xr-xtest/integration/test-apt-ftparchive-cachedb-lp12744668
-rwxr-xr-xtest/integration/test-apt-ftparchive-src-cachedb84
-rwxr-xr-xtest/integration/test-apt-get-autoremove6
-rwxr-xr-xtest/integration/test-apt-get-build-dep6
-rwxr-xr-xtest/integration/test-apt-get-changelog104
-rwxr-xr-xtest/integration/test-apt-get-download2
-rwxr-xr-xtest/integration/test-apt-get-install-deb21
-rwxr-xr-xtest/integration/test-apt-get-source62
-rwxr-xr-xtest/integration/test-apt-get-source-arch39
-rwxr-xr-xtest/integration/test-apt-get-source-authenticated3
-rwxr-xr-xtest/integration/test-apt-get-source-multisources18
-rwxr-xr-xtest/integration/test-apt-get-update-unauth-warning59
-rwxr-xr-xtest/integration/test-apt-get-upgrade92
-rwxr-xr-xtest/integration/test-apt-helper59
-rwxr-xr-xtest/integration/test-apt-https-no-redirect15
-rwxr-xr-xtest/integration/test-apt-key11
-rwxr-xr-xtest/integration/test-apt-key-net-update4
-rwxr-xr-xtest/integration/test-apt-mark101
-rwxr-xr-xtest/integration/test-apt-progress-fd79
-rwxr-xr-xtest/integration/test-apt-progress-fd-deb82221
-rwxr-xr-xtest/integration/test-apt-progress-fd-error2
-rwxr-xr-xtest/integration/test-apt-sources-deb82255
-rwxr-xr-xtest/integration/test-apt-tagfile-fields-order82
-rwxr-xr-xtest/integration/test-apt-translation-has-no-packages6
-rwxr-xr-xtest/integration/test-apt-update-expected-size93
-rwxr-xr-xtest/integration/test-apt-update-file29
-rwxr-xr-xtest/integration/test-apt-update-ims178
-rwxr-xr-xtest/integration/test-apt-update-nofallback24
-rwxr-xr-xtest/integration/test-apt-update-not-modified161
-rwxr-xr-xtest/integration/test-apt-update-rollback25
-rwxr-xr-xtest/integration/test-apt-update-stale13
-rwxr-xr-xtest/integration/test-apt-update-transactions43
-rwxr-xr-xtest/integration/test-architecture-specification-parsing20
-rwxr-xr-xtest/integration/test-authentication-basic6
-rwxr-xr-xtest/integration/test-bug-470115-new-and-tighten-recommends20
-rwxr-xr-xtest/integration/test-bug-507998-dist-upgrade-recommends2
-rwxr-xr-xtest/integration/test-bug-543966-downgrade-below-1000-pin92
-rwxr-xr-xtest/integration/test-bug-549968-install-depends-of-not-installed2
-rwxr-xr-xtest/integration/test-bug-590041-prefer-non-virtual-packages8
-rwxr-xr-xtest/integration/test-bug-590438-broken-provides-thanks-to-remove-order2
-rwxr-xr-xtest/integration/test-bug-591882-conkeror4
-rwxr-xr-xtest/integration/test-bug-593360-modifiers-in-names16
-rwxr-xr-xtest/integration/test-bug-595691-empty-and-broken-archive-files33
-rwxr-xr-xtest/integration/test-bug-596498-trusted-unsigned-repo20
-rwxr-xr-xtest/integration/test-bug-598669-install-postfix-gets-exim-heavy2
-rwxr-xr-xtest/integration/test-bug-601961-install-info6
-rwxr-xr-xtest/integration/test-bug-602412-dequote-redirect8
-rwxr-xr-xtest/integration/test-bug-604222-new-and-autoremove10
-rwxr-xr-xtest/integration/test-bug-605394-versioned-or-groups2
-rwxr-xr-xtest/integration/test-bug-611729-mark-as-manual6
-rwxr-xr-xtest/integration/test-bug-612099-multiarch-conflicts30
-rwxr-xr-xtest/integration/test-bug-612557-garbage-upgrade6
-rwxr-xr-xtest/integration/test-bug-613420-new-garbage-dependency2
-rwxr-xr-xtest/integration/test-bug-618848-always-respect-user-requests2
-rwxr-xr-xtest/integration/test-bug-624218-Translation-file-handling54
-rwxr-xr-xtest/integration/test-bug-632221-cross-dependency-satisfaction30
-rwxr-xr-xtest/integration/test-bug-64141-install-dependencies-for-on-hold4
-rwxr-xr-xtest/integration/test-bug-657695-resolver-breaks-on-virtuals2
-rwxr-xr-xtest/integration/test-bug-661537-build-profiles-support8
-rwxr-xr-xtest/integration/test-bug-675449-essential-are-protected10
-rwxr-xr-xtest/integration/test-bug-679371-apt-get-autoclean-multiarch2
-rwxr-xr-xtest/integration/test-bug-680041-apt-mark-holds-correctly20
-rwxr-xr-xtest/integration/test-bug-683786-build-dep-on-virtual-packages18
-rwxr-xr-xtest/integration/test-bug-686346-package-missing-architecture10
-rwxr-xr-xtest/integration/test-bug-689582-100-char-long-path-names2
-rwxr-xr-xtest/integration/test-bug-691453-apt-cache-search-multi-pattern12
-rwxr-xr-xtest/integration/test-bug-709560-set-candidate-release2
-rwxr-xr-xtest/integration/test-bug-712435-missing-descriptions18
-rwxr-xr-xtest/integration/test-bug-717891-abolute-uris-for-proxies2
-rwxr-xr-xtest/integration/test-bug-718329-support-data.tar-uncompressed (renamed from test/integration/test-apt-bug-718329-support-data.tar)9
-rwxr-xr-xtest/integration/test-bug-719263-print-uris-removes-authentication2
-rwxr-xr-xtest/integration/test-bug-720597-build-dep-purge4
-rwxr-xr-xtest/integration/test-bug-722207-print-uris-even-if-very-quiet23
-rwxr-xr-xtest/integration/test-bug-723586-any-stripped-in-single-arch10
-rwxr-xr-xtest/integration/test-bug-728500-tempdir2
-rwxr-xr-xtest/integration/test-bug-732746-preferences2
-rwxr-xr-xtest/integration/test-bug-735967-lib32-to-i386-unavailable8
-rwxr-xr-xtest/integration/test-bug-738785-switch-protocol31
-rwxr-xr-xtest/integration/test-bug-745036-new-foreign-invalidates-cache2
-rwxr-xr-xtest/integration/test-bug-745046-candidate-propagation-fails4
-rwxr-xr-xtest/integration/test-bug-753297-upgradable4
-rwxr-xr-xtest/integration/test-bug-758153-versioned-provides-support88
-rwxr-xr-xtest/integration/test-bug-769609-triggers-still-pending-after-run75
-rwxr-xr-xtest/integration/test-bug-770291-reinstall98
-rwxr-xr-xtest/integration/test-bug-778375-server-has-no-reason-phrase40
-rwxr-xr-xtest/integration/test-bug-782777-single-arch-weirdness72
-rwxr-xr-xtest/integration/test-bug-lp1445239-download-loop29
-rwxr-xr-xtest/integration/test-bug-multiarch-upgrade2
-rwxr-xr-xtest/integration/test-cachecontainer-architecture-specification32
-rwxr-xr-xtest/integration/test-compressed-indexes28
-rwxr-xr-xtest/integration/test-conflicts-loop2
-rwxr-xr-xtest/integration/test-conflicts-real-multiarch-same6
-rwxr-xr-xtest/integration/test-cve-2013-1051-InRelease-parsing23
-rwxr-xr-xtest/integration/test-essential-force-loopbreak2
-rwxr-xr-xtest/integration/test-external-dependency-solver-protocol36
-rwxr-xr-xtest/integration/test-failing-maintainer-scripts46
-rwxr-xr-xtest/integration/test-handling-broken-orgroups14
-rwxr-xr-xtest/integration/test-ignore-provides-if-versioned-breaks18
-rwxr-xr-xtest/integration/test-ignore-provides-if-versioned-conflicts18
-rwxr-xr-xtest/integration/test-implicit-conflicts-real-not-virtual8
-rwxr-xr-xtest/integration/test-kernel-helper-autoremove13
-rwxr-xr-xtest/integration/test-method-rred194
-rwxr-xr-xtest/integration/test-multiarch-foreign169
-rwxr-xr-xtest/integration/test-no-fds-leaked-to-maintainer-scripts119
-rwxr-xr-xtest/integration/test-ordering-ignore-not-matching-breaks8
-rwxr-xr-xtest/integration/test-package-reinstallation2
-rwxr-xr-xtest/integration/test-partial-file-support75
-rwxr-xr-xtest/integration/test-pdiff-usage108
-rwxr-xr-xtest/integration/test-pin-non-existent-package12
-rwxr-xr-xtest/integration/test-policy-pinning106
-rwxr-xr-xtest/integration/test-prefer-higher-priority-providers14
-rwxr-xr-xtest/integration/test-prefer-native-architecture-over-higher-priority2
-rwxr-xr-xtest/integration/test-prevent-markinstall-multiarch-same-versionscrew6
-rwxr-xr-xtest/integration/test-provides-gone-with-upgrade2
-rwxr-xr-xtest/integration/test-release-candidate-switching32
-rwxr-xr-xtest/integration/test-releasefile-date-older62
-rwxr-xr-xtest/integration/test-releasefile-valid-until37
-rwxr-xr-xtest/integration/test-releasefile-verification104
-rwxr-xr-xtest/integration/test-resolve-by-keep-new-recommends2
-rwxr-xr-xtest/integration/test-sourceslist-trusted-options4
-rwxr-xr-xtest/integration/test-specific-architecture-dependencies172
-rwxr-xr-xtest/integration/test-suggest-installed-multiarch-silbing16
-rwxr-xr-xtest/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum48
-rwxr-xr-xtest/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings12
-rwxr-xr-xtest/integration/test-ubuntu-bug-1304403-obsolete-priority-standard4
-rwxr-xr-xtest/integration/test-ubuntu-bug-346386-apt-get-update-paywall3
-rwxr-xr-xtest/integration/test-ubuntu-bug-6149932
-rwxr-xr-xtest/integration/test-ubuntu-bug-761175-remove-purge63
-rwxr-xr-xtest/integration/test-ubuntu-bug-784473-InRelease-one-message-only2
-rwxr-xr-xtest/integration/test-ubuntu-bug-802901-multiarch-early-remove2
-rwxr-xr-xtest/integration/test-ubuntu-bug-806274-install-suggests8
-rwxr-xr-xtest/integration/test-ubuntu-bug-859188-multiarch-reinstall8
-rwxr-xr-xtest/integration/test-ubuntu-bug-985852-pre-depends-or-group-ordering2
-rwxr-xr-xtest/integration/test-unpack-different-version-unpacked14
-rwxr-xr-xtest/integration/test-xorg-break-providers6
-rw-r--r--test/interactive-helper/aptwebserver.cc328
-rw-r--r--test/libapt/acqprogress_test.cc178
-rw-r--r--test/libapt/cdrom_test.cc3
-rw-r--r--test/libapt/fileutl_test.cc38
-rw-r--r--test/libapt/hashsums_test.cc27
-rw-r--r--test/libapt/indexcopytosourcelist_test.cc2
-rw-r--r--test/libapt/makefile10
-rw-r--r--test/libapt/sourcelist_test.cc2
-rw-r--r--test/libapt/strutil_test.cc22
-rw-r--r--test/libapt/tagfile_test.cc6
-rw-r--r--test/libapt/tagsection_test.cc270
-rw-r--r--test/libapt/uri_test.cc51
-rw-r--r--vendor/ubuntu/apt.conf-01-vendor-ubuntu6
373 files changed, 52895 insertions, 48186 deletions
diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h
index 5aa38aedc..f53356847 100644
--- a/apt-inst/contrib/arfile.h
+++ b/apt-inst/contrib/arfile.h
@@ -17,6 +17,7 @@
#include <string>
+#include <apt-pkg/macros.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/fileutl.h>
#endif
@@ -61,7 +62,11 @@ struct ARArchive::Member
unsigned long long Size;
// Location of the data.
+#if APT_PKG_ABI >= 413
unsigned long long Start;
+#else
+ unsigned long Start;
+#endif
Member *Next;
Member() : Start(0), Next(0) {};
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 2c86d0d01..be0b69d96 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -60,8 +60,13 @@ struct ExtractTar::TarHeader
// ExtractTar::ExtractTar - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
+#if APT_PKG_ABI >= 413
ExtractTar::ExtractTar(FileFd &Fd,unsigned long long Max,string DecompressionProgram)
: File(Fd), MaxInSize(Max), DecompressProg(DecompressionProgram)
+#else
+ExtractTar::ExtractTar(FileFd &Fd,unsigned long Max,string DecompressionProgram)
+ : File(Fd), MaxInSize(Max), DecompressProg(DecompressionProgram)
+#endif
{
GZPid = -1;
Eof = false;
diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h
index 472e018f4..57be956bd 100644
--- a/apt-inst/contrib/extracttar.h
+++ b/apt-inst/contrib/extracttar.h
@@ -15,6 +15,7 @@
#define PKGLIB_EXTRACTTAR_H
#include <apt-pkg/fileutl.h>
+#include <apt-pkg/macros.h>
#include <string>
@@ -39,7 +40,11 @@ class ExtractTar
GNU_LongLink = 'K',GNU_LongName = 'L'};
FileFd &File;
+#if APT_PKG_ABI >= 413
unsigned long long MaxInSize;
+#else
+ unsigned long MaxInSize;
+#endif
int GZPid;
FileFd InFd;
bool Eof;
@@ -52,8 +57,12 @@ class ExtractTar
public:
bool Go(pkgDirStream &Stream);
-
+
+#if APT_PKG_ABI >= 413
ExtractTar(FileFd &Fd,unsigned long long Max,std::string DecompressionProgram);
+#else
+ ExtractTar(FileFd &Fd,unsigned long Max,std::string DecompressionProgram);
+#endif
virtual ~ExtractTar();
};
diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index 4853a13c7..a8bf754e4 100644
--- a/apt-inst/deb/debfile.cc
+++ b/apt-inst/deb/debfile.cc
@@ -203,7 +203,11 @@ bool debDebFile::MemControlExtract::DoItem(Item &Itm,int &Fd)
/* Just memcopy the block from the tar extractor and put it in the right
place in the pre-allocated memory block. */
bool debDebFile::MemControlExtract::Process(Item &/*Itm*/,const unsigned char *Data,
+#if APT_PKG_ABI >= 413
unsigned long long Size,unsigned long long Pos)
+#else
+ unsigned long Size,unsigned long Pos)
+#endif
{
memcpy(Control + Pos, Data,Size);
return true;
@@ -232,7 +236,11 @@ bool debDebFile::MemControlExtract::Read(debDebFile &Deb)
// ---------------------------------------------------------------------
/* The given memory block is loaded into the parser and parsed as a control
record. */
+#if APT_PKG_ABI >= 413
bool debDebFile::MemControlExtract::TakeControl(const void *Data,unsigned long long Size)
+#else
+bool debDebFile::MemControlExtract::TakeControl(const void *Data,unsigned long Size)
+#endif
{
delete [] Control;
Control = new char[Size+2];
diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h
index b068efcec..9d286716a 100644
--- a/apt-inst/deb/debfile.h
+++ b/apt-inst/deb/debfile.h
@@ -27,6 +27,7 @@
#include <apt-pkg/arfile.h>
#include <apt-pkg/dirstream.h>
#include <apt-pkg/tagfile.h>
+#include <apt-pkg/macros.h>
#include <string>
@@ -81,13 +82,20 @@ class debDebFile::MemControlExtract : public pkgDirStream
// Members from DirStream
virtual bool DoItem(Item &Itm,int &Fd);
virtual bool Process(Item &Itm,const unsigned char *Data,
+#if APT_PKG_ABI >= 413
unsigned long long Size,unsigned long long Pos);
-
+#else
+ unsigned long Size,unsigned long Pos);
+#endif
// Helpers
bool Read(debDebFile &Deb);
+#if APT_PKG_ABI >= 413
bool TakeControl(const void *Data,unsigned long long Size);
-
+#else
+ bool TakeControl(const void *Data,unsigned long Size);
+#endif
+
MemControlExtract() : IsControl(false), Control(0), Length(0), Member("control") {};
MemControlExtract(std::string Member) : IsControl(false), Control(0), Length(0), Member(Member) {};
~MemControlExtract() {delete [] Control;};
diff --git a/apt-inst/dirstream.h b/apt-inst/dirstream.h
index 571fe86a5..53ac24ba5 100644
--- a/apt-inst/dirstream.h
+++ b/apt-inst/dirstream.h
@@ -25,6 +25,7 @@
#ifndef PKGLIB_DIRSTREAM_H
#define PKGLIB_DIRSTREAM_H
+#include <apt-pkg/macros.h>
class pkgDirStream
{
@@ -37,10 +38,15 @@ class pkgDirStream
Directory, FIFO} Type;
char *Name;
char *LinkTarget;
+#if APT_PKG_ABI >= 413
unsigned long long Size;
+#endif
unsigned long Mode;
unsigned long UID;
unsigned long GID;
+#if APT_PKG_ABI < 413
+ unsigned long Size;
+#endif
unsigned long MTime;
unsigned long Major;
unsigned long Minor;
@@ -49,9 +55,13 @@ class pkgDirStream
virtual bool DoItem(Item &Itm,int &Fd);
virtual bool Fail(Item &Itm,int Fd);
virtual bool FinishedFile(Item &Itm,int Fd);
+#if APT_PKG_ABI >= 413
virtual bool Process(Item &/*Itm*/,const unsigned char * /*Data*/,
unsigned long long /*Size*/,unsigned long long /*Pos*/) {return true;};
-
+#else
+ virtual bool Process(Item &/*Itm*/,const unsigned char * /*Data*/,
+ unsigned long /*Size*/,unsigned long /*Pos*/) {return true;};
+#endif
virtual ~pkgDirStream() {};
};
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 605ca7ae4..3313aaabc 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -31,6 +31,7 @@
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/cacheiterators.h>
#include <apt-pkg/pkgrecords.h>
+#include <apt-pkg/gpgv.h>
#include <stddef.h>
#include <stdlib.h>
@@ -74,6 +75,11 @@ static std::string GetPartialFileNameFromURI(std::string const &uri) /*{{{*/
return GetPartialFileName(URItoFileName(uri));
}
/*}}}*/
+static std::string GetFinalFileNameFromURI(std::string const &uri) /*{{{*/
+{
+ return _config->FindDir("Dir::State::lists") + URItoFileName(uri);
+}
+ /*}}}*/
static std::string GetCompressedFileName(std::string const &URI, std::string const &Name, std::string const &Ext) /*{{{*/
{
if (Ext.empty() || Ext == "uncompressed")
@@ -90,6 +96,19 @@ static std::string GetCompressedFileName(std::string const &URI, std::string con
return Name;
}
/*}}}*/
+static std::string GetMergeDiffsPatchFileName(std::string const &Final, std::string const &Patch)/*{{{*/
+{
+ // rred expects the patch as $FinalFile.ed.$patchname.gz
+ return Final + ".ed." + Patch + ".gz";
+}
+ /*}}}*/
+static std::string GetDiffsPatchFileName(std::string const &Final) /*{{{*/
+{
+ // rred expects the patch as $FinalFile.ed
+ return Final + ".ed";
+}
+ /*}}}*/
+
static bool AllowInsecureRepositories(indexRecords const * const MetaIndexParser, pkgAcqMetaBase * const TransactionManager, pkgAcquire::Item * const I) /*{{{*/
{
if(MetaIndexParser->IsAlwaysTrusted() || _config->FindB("Acquire::AllowInsecureRepositories") == true)
@@ -101,42 +120,339 @@ static bool AllowInsecureRepositories(indexRecords const * const MetaIndexParser
return false;
}
/*}}}*/
+static HashStringList GetExpectedHashesFromFor(indexRecords * const Parser, std::string const MetaKey)/*{{{*/
+{
+ if (Parser == NULL)
+ return HashStringList();
+ indexRecords::checkSum * const R = Parser->Lookup(MetaKey);
+ if (R == NULL)
+ return HashStringList();
+ return R->Hashes;
+}
+ /*}}}*/
+
+// all ::HashesRequired and ::GetExpectedHashes implementations /*{{{*/
+/* ::GetExpectedHashes is abstract and has to be implemented by all subclasses.
+ It is best to implement it as broadly as possible, while ::HashesRequired defaults
+ to true and should be as restrictive as possible for false cases. Note that if
+ a hash is returned by ::GetExpectedHashes it must match. Only if it doesn't
+ ::HashesRequired is called to evaluate if its okay to have no hashes. */
+APT_CONST bool pkgAcqTransactionItem::HashesRequired() const
+{
+ /* signed repositories obviously have a parser and good hashes.
+ unsigned repositories, too, as even if we can't trust them for security,
+ we can at least trust them for integrity of the download itself.
+ Only repositories without a Release file can (obviously) not have
+ hashes – and they are very uncommon and strongly discouraged */
+ return TransactionManager->MetaIndexParser != NULL;
+}
+HashStringList pkgAcqTransactionItem::GetExpectedHashes() const
+{
+ return GetExpectedHashesFor(GetMetaKey());
+}
+
+APT_CONST bool pkgAcqMetaBase::HashesRequired() const
+{
+ // Release and co have no hashes 'by design'.
+ return false;
+}
+HashStringList pkgAcqMetaBase::GetExpectedHashes() const
+{
+ return HashStringList();
+}
+
+APT_CONST bool pkgAcqIndexDiffs::HashesRequired() const
+{
+ /* We don't always have the diff of the downloaded pdiff file.
+ What we have for sure is hashes for the uncompressed file,
+ but rred uncompresses them on the fly while parsing, so not handled here.
+ Hashes are (also) checked while searching for (next) patch to apply. */
+ if (State == StateFetchDiff)
+ return available_patches[0].download_hashes.empty() == false;
+ return false;
+}
+HashStringList pkgAcqIndexDiffs::GetExpectedHashes() const
+{
+ if (State == StateFetchDiff)
+ return available_patches[0].download_hashes;
+ return HashStringList();
+}
+
+APT_CONST bool pkgAcqIndexMergeDiffs::HashesRequired() const
+{
+ /* @see #pkgAcqIndexDiffs::HashesRequired, with the difference that
+ we can check the rred result after all patches are applied as
+ we know the expected result rather than potentially apply more patches */
+ if (State == StateFetchDiff)
+ return patch.download_hashes.empty() == false;
+ return State == StateApplyDiff;
+}
+HashStringList pkgAcqIndexMergeDiffs::GetExpectedHashes() const
+{
+ if (State == StateFetchDiff)
+ return patch.download_hashes;
+ else if (State == StateApplyDiff)
+ return GetExpectedHashesFor(Target.MetaKey);
+ return HashStringList();
+}
+
+APT_CONST bool pkgAcqArchive::HashesRequired() const
+{
+ return LocalSource == false;
+}
+HashStringList pkgAcqArchive::GetExpectedHashes() const
+{
+ // figured out while parsing the records
+ return ExpectedHashes;
+}
+
+APT_CONST bool pkgAcqFile::HashesRequired() const
+{
+ // supplied as parameter at creation time, so the caller decides
+ return ExpectedHashes.usable();
+}
+HashStringList pkgAcqFile::GetExpectedHashes() const
+{
+ return ExpectedHashes;
+}
+ /*}}}*/
+// Acquire::Item::QueueURI and specialisations from child classes /*{{{*/
+bool pkgAcquire::Item::QueueURI(pkgAcquire::ItemDesc &Item)
+{
+ Owner->Enqueue(Item);
+ return true;
+}
+/* The idea here is that an item isn't queued if it exists on disk and the
+ transition manager was a hit as this means that the files it contains
+ the checksums for can't be updated either (or they are and we are asking
+ for a hashsum mismatch to happen which helps nobody) */
+bool pkgAcqTransactionItem::QueueURI(pkgAcquire::ItemDesc &Item)
+{
+ std::string const FinalFile = GetFinalFilename();
+ if (TransactionManager != NULL && TransactionManager->IMSHit == true &&
+ FileExists(FinalFile) == true)
+ {
+ PartialFile = DestFile = FinalFile;
+ Status = StatDone;
+ return false;
+ }
+ return pkgAcquire::Item::QueueURI(Item);
+}
+/* The transition manager InRelease itself (or its older sisters-in-law
+ Release & Release.gpg) is always queued as this allows us to rerun gpgv
+ on it to verify that we aren't stalled with old files */
+bool pkgAcqMetaBase::QueueURI(pkgAcquire::ItemDesc &Item)
+{
+ return pkgAcquire::Item::QueueURI(Item);
+}
+/* the Diff/Index needs to queue also the up-to-date complete index file
+ to ensure that the list cleaner isn't eating it */
+bool pkgAcqDiffIndex::QueueURI(pkgAcquire::ItemDesc &Item)
+{
+ if (pkgAcqTransactionItem::QueueURI(Item) == true)
+ return true;
+ QueueOnIMSHit();
+ return false;
+}
+ /*}}}*/
+// Acquire::Item::GetFinalFilename and specialisations for child classes /*{{{*/
+std::string pkgAcquire::Item::GetFinalFilename() const
+{
+ return GetFinalFileNameFromURI(Desc.URI);
+}
+std::string pkgAcqDiffIndex::GetFinalFilename() const
+{
+ // the logic we inherent from pkgAcqBaseIndex isn't what we need here
+ return pkgAcquire::Item::GetFinalFilename();
+}
+std::string pkgAcqIndex::GetFinalFilename() const
+{
+ std::string const FinalFile = GetFinalFileNameFromURI(Target.URI);
+ return GetCompressedFileName(Target.URI, FinalFile, CurrentCompressionExtension);
+}
+std::string pkgAcqMetaSig::GetFinalFilename() const
+{
+ return GetFinalFileNameFromURI(Target.URI);
+}
+std::string pkgAcqBaseIndex::GetFinalFilename() const
+{
+ return GetFinalFileNameFromURI(Target.URI);
+}
+std::string pkgAcqMetaBase::GetFinalFilename() const
+{
+ return GetFinalFileNameFromURI(Target.URI);
+}
+std::string pkgAcqArchive::GetFinalFilename() const
+{
+ return _config->FindDir("Dir::Cache::Archives") + flNotDir(StoreFilename);
+}
+ /*}}}*/
+// pkgAcqTransactionItem::GetMetaKey and specialisations for child classes /*{{{*/
+std::string pkgAcqTransactionItem::GetMetaKey() const
+{
+ return Target.MetaKey;
+}
+std::string pkgAcqIndex::GetMetaKey() const
+{
+ if (Stage == STAGE_DECOMPRESS_AND_VERIFY || CurrentCompressionExtension == "uncompressed")
+ return Target.MetaKey;
+ return Target.MetaKey + "." + CurrentCompressionExtension;
+}
+std::string pkgAcqDiffIndex::GetMetaKey() const
+{
+ return Target.MetaKey + ".diff/Index";
+}
+ /*}}}*/
+//pkgAcqTransactionItem::TransactionState and specialisations for child classes /*{{{*/
+bool pkgAcqTransactionItem::TransactionState(TransactionStates const state)
+{
+ bool const Debug = _config->FindB("Debug::Acquire::Transaction", false);
+ switch(state)
+ {
+ case TransactionAbort:
+ if(Debug == true)
+ std::clog << " Cancel: " << DestFile << std::endl;
+ if (Status == pkgAcquire::Item::StatIdle)
+ {
+ Status = pkgAcquire::Item::StatDone;
+ Dequeue();
+ }
+ break;
+ case TransactionCommit:
+ if(PartialFile != "")
+ {
+ if(Debug == true)
+ std::clog << "mv " << PartialFile << " -> "<< DestFile << " # " << DescURI() << std::endl;
+
+ Rename(PartialFile, DestFile);
+ } else {
+ if(Debug == true)
+ std::clog << "rm " << DestFile << " # " << DescURI() << std::endl;
+ unlink(DestFile.c_str());
+ }
+ break;
+ }
+ return true;
+}
+bool pkgAcqMetaBase::TransactionState(TransactionStates const state)
+{
+ // Do not remove InRelease on IMSHit of Release.gpg [yes, this is very edgecasey]
+ if (TransactionManager->IMSHit == false)
+ return pkgAcqTransactionItem::TransactionState(state);
+ return true;
+}
+bool pkgAcqIndex::TransactionState(TransactionStates const state)
+{
+ if (pkgAcqTransactionItem::TransactionState(state) == false)
+ return false;
+
+ switch (state)
+ {
+ case TransactionAbort:
+ if (Stage == STAGE_DECOMPRESS_AND_VERIFY)
+ {
+ // keep the compressed file, but drop the decompressed
+ EraseFileName.clear();
+ if (PartialFile.empty() == false && flExtension(PartialFile) == "decomp")
+ unlink(PartialFile.c_str());
+ }
+ break;
+ case TransactionCommit:
+ if (EraseFileName.empty() == false)
+ unlink(EraseFileName.c_str());
+ break;
+ }
+ return true;
+}
+bool pkgAcqDiffIndex::TransactionState(TransactionStates const state)
+{
+ if (pkgAcqTransactionItem::TransactionState(state) == false)
+ return false;
+
+ switch (state)
+ {
+ case TransactionCommit:
+ break;
+ case TransactionAbort:
+ std::string const Partial = GetPartialFileNameFromURI(Target.URI);
+ unlink(Partial.c_str());
+ break;
+ }
+
+ return true;
+}
+ /*}}}*/
+class APT_HIDDEN NoActionItem : public pkgAcquire::Item /*{{{*/
+/* The sole purpose of this class is having an item which does nothing to
+ reach its done state to prevent cleanup deleting the mentioned file.
+ Handy in cases in which we know we have the file already, like IMS-Hits. */
+{
+ IndexTarget const Target;
+ public:
+ virtual std::string DescURI() const {return Target.URI;};
+ virtual HashStringList GetExpectedHashes() const {return HashStringList();};
+
+ NoActionItem(pkgAcquire * const Owner, IndexTarget const Target) :
+ pkgAcquire::Item(Owner), Target(Target)
+ {
+ Status = StatDone;
+ DestFile = GetFinalFileNameFromURI(Target.URI);
+ }
+};
+ /*}}}*/
// Acquire::Item::Item - Constructor /*{{{*/
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-pkgAcquire::Item::Item(pkgAcquire *Owner,
- HashStringList const &ExpectedHashes,
- pkgAcqMetaBase *TransactionManager)
- : Owner(Owner), FileSize(0), PartialSize(0), Mode(0), ID(0), Complete(false),
- Local(false), QueueCounter(0), TransactionManager(TransactionManager),
- ExpectedAdditionalItems(0), ExpectedHashes(ExpectedHashes)
+APT_IGNORE_DEPRECATED_PUSH
+pkgAcquire::Item::Item(pkgAcquire * const Owner) :
+ FileSize(0), PartialSize(0), Mode(0), ID(0), Complete(false), Local(false),
+ QueueCounter(0), ExpectedAdditionalItems(0), Owner(Owner)
{
Owner->Add(this);
Status = StatIdle;
- if(TransactionManager != NULL)
- TransactionManager->Add(this);
}
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
/*}}}*/
// Acquire::Item::~Item - Destructor /*{{{*/
-// ---------------------------------------------------------------------
-/* */
pkgAcquire::Item::~Item()
{
Owner->Remove(this);
}
/*}}}*/
+std::string pkgAcquire::Item::Custom600Headers() const /*{{{*/
+{
+ return std::string();
+}
+ /*}}}*/
+std::string pkgAcquire::Item::ShortDesc() const /*{{{*/
+{
+ return DescURI();
+}
+ /*}}}*/
+APT_CONST void pkgAcquire::Item::Finished() /*{{{*/
+{
+}
+ /*}}}*/
+APT_PURE pkgAcquire * pkgAcquire::Item::GetOwner() const /*{{{*/
+{
+ return Owner;
+}
+ /*}}}*/
+APT_CONST pkgAcquire::ItemDesc &pkgAcquire::Item::GetItemDesc() /*{{{*/
+{
+ return Desc;
+}
+ /*}}}*/
+APT_CONST bool pkgAcquire::Item::IsTrusted() const /*{{{*/
+{
+ return false;
+}
+ /*}}}*/
// Acquire::Item::Failed - Item failed to download /*{{{*/
// ---------------------------------------------------------------------
/* We return to an idle state if there are still other queues that could
fetch this object */
-void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
+void pkgAcquire::Item::Failed(string const &Message,pkgAcquire::MethodConfig const * const Cnf)
{
if(ErrorText.empty())
ErrorText = LookupTag(Message,"Message");
@@ -154,30 +470,43 @@ void pkgAcquire::Item::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
return;
}
- Status = StatError;
+ switch (Status)
+ {
+ case StatIdle:
+ case StatFetching:
+ case StatDone:
+ Status = StatError;
+ break;
+ case StatAuthError:
+ case StatError:
+ case StatTransientNetworkError:
+ break;
+ }
Complete = false;
Dequeue();
}
- else
- Status = StatIdle;
- // check fail reason
string const FailReason = LookupTag(Message, "FailReason");
- if(FailReason == "MaximumSizeExceeded")
+ if (FailReason == "MaximumSizeExceeded")
RenameOnError(MaximumSizeExceeded);
+ else if (Status == StatAuthError)
+ RenameOnError(HashSumMismatch);
// report mirror failure back to LP if we actually use a mirror
- if(FailReason.size() != 0)
+ if (FailReason.empty() == false)
ReportMirrorFailure(FailReason);
else
ReportMirrorFailure(ErrorText);
+
+ if (QueueCounter > 1)
+ Status = StatIdle;
}
/*}}}*/
// Acquire::Item::Start - Item has begun to download /*{{{*/
// ---------------------------------------------------------------------
-/* Stash status and the file size. Note that setting Complete means
+/* Stash status and the file size. Note that setting Complete means
sub-phases of the acquire process such as decompresion are operating */
-void pkgAcquire::Item::Start(string /*Message*/,unsigned long long Size)
+void pkgAcquire::Item::Start(string const &/*Message*/, unsigned long long const Size)
{
Status = StatFetching;
ErrorText.clear();
@@ -186,22 +515,19 @@ void pkgAcquire::Item::Start(string /*Message*/,unsigned long long Size)
}
/*}}}*/
// Acquire::Item::Done - Item downloaded OK /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void pkgAcquire::Item::Done(string Message,unsigned long long Size,HashStringList const &/*Hash*/,
- pkgAcquire::MethodConfig * /*Cnf*/)
+void pkgAcquire::Item::Done(string const &Message, HashStringList const &Hashes,
+ pkgAcquire::MethodConfig const * const /*Cnf*/)
{
// We just downloaded something..
- string FileName = LookupTag(Message,"Filename");
UsedMirror = LookupTag(Message,"UsedMirror");
- if (Complete == false && !Local && FileName == DestFile)
+ if (FileSize == 0)
{
- if (Owner->Log != 0)
- Owner->Log->Fetched(Size,atoi(LookupTag(Message,"Resume-Point","0").c_str()));
+ unsigned long long const downloadedSize = Hashes.FileSize();
+ if (downloadedSize != 0)
+ {
+ FileSize = downloadedSize;
+ }
}
-
- if (FileSize == 0)
- FileSize= Size;
Status = StatDone;
ErrorText = string();
Owner->Dequeue(this);
@@ -211,24 +537,22 @@ void pkgAcquire::Item::Done(string Message,unsigned long long Size,HashStringLis
// ---------------------------------------------------------------------
/* This helper function is used by a lot of item methods as their final
step */
-bool pkgAcquire::Item::Rename(string From,string To)
+bool pkgAcquire::Item::Rename(string const &From,string const &To)
{
- if (rename(From.c_str(),To.c_str()) == 0)
+ if (From == To || rename(From.c_str(),To.c_str()) == 0)
return true;
std::string S;
strprintf(S, _("rename failed, %s (%s -> %s)."), strerror(errno),
From.c_str(),To.c_str());
Status = StatError;
- ErrorText += S;
+ if (ErrorText.empty())
+ ErrorText = S;
+ else
+ ErrorText = ErrorText + ": " + S;
return false;
}
/*}}}*/
-void pkgAcquire::Item::QueueURI(ItemDesc &Item) /*{{{*/
-{
- Owner->Enqueue(Item);
-}
- /*}}}*/
void pkgAcquire::Item::Dequeue() /*{{{*/
{
Owner->Dequeue(this);
@@ -239,55 +563,53 @@ bool pkgAcquire::Item::RenameOnError(pkgAcquire::Item::RenameOnErrorState const
if (RealFileExists(DestFile))
Rename(DestFile, DestFile + ".FAILED");
+ std::string errtext;
switch (error)
{
case HashSumMismatch:
- ErrorText = _("Hash Sum mismatch");
+ errtext = _("Hash Sum mismatch");
Status = StatAuthError;
ReportMirrorFailure("HashChecksumFailure");
break;
case SizeMismatch:
- ErrorText = _("Size mismatch");
+ errtext = _("Size mismatch");
Status = StatAuthError;
ReportMirrorFailure("SizeFailure");
break;
case InvalidFormat:
- ErrorText = _("Invalid file format");
+ errtext = _("Invalid file format");
Status = StatError;
// do not report as usually its not the mirrors fault, but Portal/Proxy
break;
case SignatureError:
- ErrorText = _("Signature error");
+ errtext = _("Signature error");
Status = StatError;
break;
case NotClearsigned:
- ErrorText = _("Does not start with a cleartext signature");
+ errtext = _("Does not start with a cleartext signature");
Status = StatError;
break;
case MaximumSizeExceeded:
// the method is expected to report a good error for this
Status = StatError;
break;
+ case PDiffError:
+ // no handling here, done by callers
+ break;
}
+ if (ErrorText.empty())
+ ErrorText = errtext;
return false;
}
/*}}}*/
void pkgAcquire::Item::SetActiveSubprocess(const std::string &subprocess)/*{{{*/
{
ActiveSubprocess = subprocess;
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
- Mode = ActiveSubprocess.c_str();
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+ APT_IGNORE_DEPRECATED(Mode = ActiveSubprocess.c_str();)
}
/*}}}*/
// Acquire::Item::ReportMirrorFailure /*{{{*/
-// ---------------------------------------------------------------------
-void pkgAcquire::Item::ReportMirrorFailure(string FailCode)
+void pkgAcquire::Item::ReportMirrorFailure(string const &FailCode)
{
// we only act if a mirror was used at all
if(UsedMirror.empty())
@@ -330,6 +652,849 @@ void pkgAcquire::Item::ReportMirrorFailure(string FailCode)
}
}
/*}}}*/
+std::string pkgAcquire::Item::HashSum() const /*{{{*/
+{
+ HashStringList const hashes = GetExpectedHashes();
+ HashString const * const hs = hashes.find(NULL);
+ return hs != NULL ? hs->toStr() : "";
+}
+ /*}}}*/
+
+pkgAcqTransactionItem::pkgAcqTransactionItem(pkgAcquire * const Owner, /*{{{*/
+ pkgAcqMetaBase * const TransactionManager, IndexTarget const Target) :
+ pkgAcquire::Item(Owner), Target(Target), TransactionManager(TransactionManager)
+{
+ if (TransactionManager != this)
+ TransactionManager->Add(this);
+}
+ /*}}}*/
+pkgAcqTransactionItem::~pkgAcqTransactionItem() /*{{{*/
+{
+}
+ /*}}}*/
+HashStringList pkgAcqTransactionItem::GetExpectedHashesFor(std::string const MetaKey) const /*{{{*/
+{
+ return GetExpectedHashesFromFor(TransactionManager->MetaIndexParser, MetaKey);
+}
+ /*}}}*/
+
+// AcqMetaBase - Constructor /*{{{*/
+pkgAcqMetaBase::pkgAcqMetaBase(pkgAcquire * const Owner,
+ pkgAcqMetaBase * const TransactionManager,
+ std::vector<IndexTarget> const IndexTargets,
+ IndexTarget const &DataTarget,
+ indexRecords * const MetaIndexParser)
+: pkgAcqTransactionItem(Owner, TransactionManager, DataTarget),
+ MetaIndexParser(MetaIndexParser), LastMetaIndexParser(NULL), IndexTargets(IndexTargets),
+ AuthPass(false), IMSHit(false)
+{
+}
+ /*}}}*/
+// AcqMetaBase::Add - Add a item to the current Transaction /*{{{*/
+void pkgAcqMetaBase::Add(pkgAcqTransactionItem * const I)
+{
+ Transaction.push_back(I);
+}
+ /*}}}*/
+// AcqMetaBase::AbortTransaction - Abort the current Transaction /*{{{*/
+void pkgAcqMetaBase::AbortTransaction()
+{
+ if(_config->FindB("Debug::Acquire::Transaction", false) == true)
+ std::clog << "AbortTransaction: " << TransactionManager << std::endl;
+
+ // ensure the toplevel is in error state too
+ for (std::vector<pkgAcqTransactionItem*>::iterator I = Transaction.begin();
+ I != Transaction.end(); ++I)
+ {
+ (*I)->TransactionState(TransactionAbort);
+ }
+ Transaction.clear();
+}
+ /*}}}*/
+// AcqMetaBase::TransactionHasError - Check for errors in Transaction /*{{{*/
+APT_PURE bool pkgAcqMetaBase::TransactionHasError() const
+{
+ for (std::vector<pkgAcqTransactionItem*>::const_iterator I = Transaction.begin();
+ I != Transaction.end(); ++I)
+ {
+ switch((*I)->Status) {
+ case StatDone: break;
+ case StatIdle: break;
+ case StatAuthError: return true;
+ case StatError: return true;
+ case StatTransientNetworkError: return true;
+ case StatFetching: break;
+ }
+ }
+ return false;
+}
+ /*}}}*/
+// AcqMetaBase::CommitTransaction - Commit a transaction /*{{{*/
+void pkgAcqMetaBase::CommitTransaction()
+{
+ if(_config->FindB("Debug::Acquire::Transaction", false) == true)
+ std::clog << "CommitTransaction: " << this << std::endl;
+
+ // move new files into place *and* remove files that are not
+ // part of the transaction but are still on disk
+ for (std::vector<pkgAcqTransactionItem*>::iterator I = Transaction.begin();
+ I != Transaction.end(); ++I)
+ {
+ (*I)->TransactionState(TransactionCommit);
+ }
+ Transaction.clear();
+}
+ /*}}}*/
+// AcqMetaBase::TransactionStageCopy - Stage a file for copying /*{{{*/
+void pkgAcqMetaBase::TransactionStageCopy(pkgAcqTransactionItem * const I,
+ const std::string &From,
+ const std::string &To)
+{
+ I->PartialFile = From;
+ I->DestFile = To;
+}
+ /*}}}*/
+// AcqMetaBase::TransactionStageRemoval - Stage a file for removal /*{{{*/
+void pkgAcqMetaBase::TransactionStageRemoval(pkgAcqTransactionItem * const I,
+ const std::string &FinalFile)
+{
+ I->PartialFile = "";
+ I->DestFile = FinalFile;
+}
+ /*}}}*/
+// AcqMetaBase::GenerateAuthWarning - Check gpg authentication error /*{{{*/
+bool pkgAcqMetaBase::CheckStopAuthentication(pkgAcquire::Item * const I, const std::string &Message)
+{
+ // FIXME: this entire function can do now that we disallow going to
+ // a unauthenticated state and can cleanly rollback
+
+ string const Final = I->GetFinalFilename();
+ if(FileExists(Final))
+ {
+ I->Status = StatTransientNetworkError;
+ _error->Warning(_("An error occurred during the signature "
+ "verification. The repository is not updated "
+ "and the previous index files will be used. "
+ "GPG error: %s: %s\n"),
+ Desc.Description.c_str(),
+ LookupTag(Message,"Message").c_str());
+ RunScripts("APT::Update::Auth-Failure");
+ return true;
+ } else if (LookupTag(Message,"Message").find("NODATA") != string::npos) {
+ /* Invalid signature file, reject (LP: #346386) (Closes: #627642) */
+ _error->Error(_("GPG error: %s: %s"),
+ Desc.Description.c_str(),
+ LookupTag(Message,"Message").c_str());
+ I->Status = StatError;
+ return true;
+ } else {
+ _error->Warning(_("GPG error: %s: %s"),
+ Desc.Description.c_str(),
+ LookupTag(Message,"Message").c_str());
+ }
+ // gpgv method failed
+ ReportMirrorFailure("GPGFailure");
+ return false;
+}
+ /*}}}*/
+// AcqMetaBase::Custom600Headers - Get header for AcqMetaBase /*{{{*/
+// ---------------------------------------------------------------------
+string pkgAcqMetaBase::Custom600Headers() const
+{
+ std::string Header = "\nIndex-File: true";
+ std::string MaximumSize;
+ strprintf(MaximumSize, "\nMaximum-Size: %i",
+ _config->FindI("Acquire::MaxReleaseFileSize", 10*1000*1000));
+ Header += MaximumSize;
+
+ string const FinalFile = GetFinalFilename();
+
+ struct stat Buf;
+ if (stat(FinalFile.c_str(),&Buf) == 0)
+ Header += "\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
+
+ return Header;
+}
+ /*}}}*/
+// AcqMetaBase::QueueForSignatureVerify /*{{{*/
+void pkgAcqMetaBase::QueueForSignatureVerify(pkgAcqTransactionItem * const I, std::string const &File, std::string const &Signature)
+{
+ AuthPass = true;
+ I->Desc.URI = "gpgv:" + Signature;
+ I->DestFile = File;
+ QueueURI(I->Desc);
+ I->SetActiveSubprocess("gpgv");
+}
+ /*}}}*/
+// AcqMetaBase::CheckDownloadDone /*{{{*/
+bool pkgAcqMetaBase::CheckDownloadDone(pkgAcqTransactionItem * const I, const std::string &Message, HashStringList const &Hashes) const
+{
+ // We have just finished downloading a Release file (it is not
+ // verified yet)
+
+ string const FileName = LookupTag(Message,"Filename");
+ if (FileName.empty() == true)
+ {
+ I->Status = StatError;
+ I->ErrorText = "Method gave a blank filename";
+ return false;
+ }
+
+ if (FileName != I->DestFile && RealFileExists(I->DestFile) == false)
+ {
+ I->Local = true;
+ I->Desc.URI = "copy:" + FileName;
+ I->QueueURI(I->Desc);
+ return false;
+ }
+
+ // make sure to verify against the right file on I-M-S hit
+ bool IMSHit = StringToBool(LookupTag(Message,"IMS-Hit"), false);
+ if (IMSHit == false && Hashes.usable())
+ {
+ // detect IMS-Hits servers haven't detected by Hash comparison
+ std::string const FinalFile = I->GetFinalFilename();
+ if (RealFileExists(FinalFile) && Hashes.VerifyFile(FinalFile) == true)
+ {
+ IMSHit = true;
+ unlink(I->DestFile.c_str());
+ }
+ }
+
+ if(IMSHit == true)
+ {
+ // for simplicity, the transaction manager is always InRelease
+ // even if it doesn't exist.
+ if (TransactionManager != NULL)
+ TransactionManager->IMSHit = true;
+ I->PartialFile = I->DestFile = I->GetFinalFilename();
+ }
+
+ // set Item to complete as the remaining work is all local (verify etc)
+ I->Complete = true;
+
+ return true;
+}
+ /*}}}*/
+bool pkgAcqMetaBase::CheckAuthDone(string const &Message) /*{{{*/
+{
+ // At this point, the gpgv method has succeeded, so there is a
+ // valid signature from a key in the trusted keyring. We
+ // perform additional verification of its contents, and use them
+ // to verify the indexes we are about to download
+
+ if (TransactionManager->IMSHit == false)
+ {
+ // open the last (In)Release if we have it
+ std::string const FinalFile = GetFinalFilename();
+ std::string FinalRelease;
+ std::string FinalInRelease;
+ if (APT::String::Endswith(FinalFile, "InRelease"))
+ {
+ FinalInRelease = FinalFile;
+ FinalRelease = FinalFile.substr(0, FinalFile.length() - strlen("InRelease")) + "Release";
+ }
+ else
+ {
+ FinalInRelease = FinalFile.substr(0, FinalFile.length() - strlen("Release")) + "InRelease";
+ FinalRelease = FinalFile;
+ }
+ if (RealFileExists(FinalInRelease) || RealFileExists(FinalRelease))
+ {
+ TransactionManager->LastMetaIndexParser = new indexRecords;
+ _error->PushToStack();
+ if (RealFileExists(FinalInRelease))
+ TransactionManager->LastMetaIndexParser->Load(FinalInRelease);
+ else
+ TransactionManager->LastMetaIndexParser->Load(FinalRelease);
+ // its unlikely to happen, but if what we have is bad ignore it
+ if (_error->PendingError())
+ {
+ delete TransactionManager->LastMetaIndexParser;
+ TransactionManager->LastMetaIndexParser = NULL;
+ }
+ _error->RevertToStack();
+ }
+ }
+
+ if (TransactionManager->MetaIndexParser->Load(DestFile) == false)
+ {
+ Status = StatAuthError;
+ ErrorText = TransactionManager->MetaIndexParser->ErrorText;
+ return false;
+ }
+
+ if (!VerifyVendor(Message))
+ {
+ Status = StatAuthError;
+ return false;
+ }
+
+ if (_config->FindB("Debug::pkgAcquire::Auth", false))
+ std::cerr << "Signature verification succeeded: "
+ << DestFile << std::endl;
+
+ // Download further indexes with verification
+ QueueIndexes(true);
+
+ return true;
+}
+ /*}}}*/
+void pkgAcqMetaBase::QueueIndexes(bool const verify) /*{{{*/
+{
+ // at this point the real Items are loaded in the fetcher
+ ExpectedAdditionalItems = 0;
+
+ for (std::vector <IndexTarget>::const_iterator Target = IndexTargets.begin();
+ Target != IndexTargets.end();
+ ++Target)
+ {
+ bool trypdiff = _config->FindB("Acquire::PDiffs", true);
+ if (verify == true)
+ {
+ if (TransactionManager->MetaIndexParser->Exists(Target->MetaKey) == false)
+ {
+ // optional targets that we do not have in the Release file are skipped
+ if (Target->IsOptional)
+ continue;
+
+ Status = StatAuthError;
+ strprintf(ErrorText, _("Unable to find expected entry '%s' in Release file (Wrong sources.list entry or malformed file)"), Target->MetaKey.c_str());
+ return;
+ }
+
+ if (RealFileExists(GetFinalFileNameFromURI(Target->URI)))
+ {
+ if (TransactionManager->LastMetaIndexParser != NULL)
+ {
+ HashStringList const newFile = GetExpectedHashesFromFor(TransactionManager->MetaIndexParser, Target->MetaKey);
+ HashStringList const oldFile = GetExpectedHashesFromFor(TransactionManager->LastMetaIndexParser, Target->MetaKey);
+ if (newFile == oldFile)
+ {
+ // we have the file already, no point in trying to acquire it again
+ new NoActionItem(Owner, *Target);
+ continue;
+ }
+ }
+ }
+ else
+ trypdiff = false; // no file to patch
+
+ // check if we have patches available
+ trypdiff &= TransactionManager->MetaIndexParser->Exists(Target->MetaKey + ".diff/Index");
+ }
+ // if we have no file to patch, no point in trying
+ trypdiff &= RealFileExists(GetFinalFileNameFromURI(Target->URI));
+
+ // no point in patching from local sources
+ if (trypdiff)
+ {
+ std::string const proto = Target->URI.substr(0, strlen("file:/"));
+ if (proto == "file:/" || proto == "copy:/" || proto == "cdrom:")
+ trypdiff = false;
+ }
+
+ // Queue the Index file (Packages, Sources, Translation-$foo, …)
+ if (trypdiff)
+ new pkgAcqDiffIndex(Owner, TransactionManager, *Target);
+ else
+ new pkgAcqIndex(Owner, TransactionManager, *Target);
+ }
+}
+ /*}}}*/
+bool pkgAcqMetaBase::VerifyVendor(string const &Message) /*{{{*/
+{
+ string::size_type pos;
+
+ // check for missing sigs (that where not fatal because otherwise we had
+ // bombed earlier)
+ string missingkeys;
+ string msg = _("There is no public key available for the "
+ "following key IDs:\n");
+ pos = Message.find("NO_PUBKEY ");
+ if (pos != std::string::npos)
+ {
+ string::size_type start = pos+strlen("NO_PUBKEY ");
+ string Fingerprint = Message.substr(start, Message.find("\n")-start);
+ missingkeys += (Fingerprint);
+ }
+ if(!missingkeys.empty())
+ _error->Warning("%s", (msg + missingkeys).c_str());
+
+ string Transformed = TransactionManager->MetaIndexParser->GetExpectedDist();
+
+ if (Transformed == "../project/experimental")
+ {
+ Transformed = "experimental";
+ }
+
+ pos = Transformed.rfind('/');
+ if (pos != string::npos)
+ {
+ Transformed = Transformed.substr(0, pos);
+ }
+
+ if (Transformed == ".")
+ {
+ Transformed = "";
+ }
+
+ if (_config->FindB("Acquire::Check-Valid-Until", true) == true &&
+ TransactionManager->MetaIndexParser->GetValidUntil() > 0) {
+ time_t const invalid_since = time(NULL) - TransactionManager->MetaIndexParser->GetValidUntil();
+ if (invalid_since > 0)
+ {
+ std::string errmsg;
+ strprintf(errmsg,
+ // TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+ // the time since then the file is invalid - formated in the same way as in
+ // the download progress display (e.g. 7d 3h 42min 1s)
+ _("Release file for %s is expired (invalid since %s). "
+ "Updates for this repository will not be applied."),
+ Target.URI.c_str(), TimeToStr(invalid_since).c_str());
+ if (ErrorText.empty())
+ ErrorText = errmsg;
+ return _error->Error("%s", errmsg.c_str());
+ }
+ }
+
+ /* Did we get a file older than what we have? This is a last minute IMS hit and doubles
+ as a prevention of downgrading us to older (still valid) files */
+ if (TransactionManager->IMSHit == false && TransactionManager->LastMetaIndexParser != NULL &&
+ TransactionManager->LastMetaIndexParser->GetDate() > TransactionManager->MetaIndexParser->GetDate())
+ {
+ TransactionManager->IMSHit = true;
+ unlink(DestFile.c_str());
+ PartialFile = DestFile = GetFinalFilename();
+ delete TransactionManager->MetaIndexParser;
+ TransactionManager->MetaIndexParser = TransactionManager->LastMetaIndexParser;
+ TransactionManager->LastMetaIndexParser = NULL;
+ }
+
+ if (_config->FindB("Debug::pkgAcquire::Auth", false))
+ {
+ std::cerr << "Got Codename: " << TransactionManager->MetaIndexParser->GetDist() << std::endl;
+ std::cerr << "Expecting Dist: " << TransactionManager->MetaIndexParser->GetExpectedDist() << std::endl;
+ std::cerr << "Transformed Dist: " << Transformed << std::endl;
+ }
+
+ if (TransactionManager->MetaIndexParser->CheckDist(Transformed) == false)
+ {
+ // This might become fatal one day
+// Status = StatAuthError;
+// ErrorText = "Conflicting distribution; expected "
+// + MetaIndexParser->GetExpectedDist() + " but got "
+// + MetaIndexParser->GetDist();
+// return false;
+ if (!Transformed.empty())
+ {
+ _error->Warning(_("Conflicting distribution: %s (expected %s but got %s)"),
+ Desc.Description.c_str(),
+ Transformed.c_str(),
+ TransactionManager->MetaIndexParser->GetDist().c_str());
+ }
+ }
+
+ return true;
+}
+ /*}}}*/
+pkgAcqMetaBase::~pkgAcqMetaBase() {}
+
+pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire * const Owner, /*{{{*/
+ IndexTarget const &ClearsignedTarget,
+ IndexTarget const &DetachedDataTarget, IndexTarget const &DetachedSigTarget,
+ std::vector<IndexTarget> const IndexTargets,
+ indexRecords * const MetaIndexParser) :
+ pkgAcqMetaIndex(Owner, this, ClearsignedTarget, DetachedSigTarget, IndexTargets, MetaIndexParser),
+ ClearsignedTarget(ClearsignedTarget),
+ DetachedDataTarget(DetachedDataTarget), DetachedSigTarget(DetachedSigTarget)
+{
+ // index targets + (worst case:) Release/Release.gpg
+ ExpectedAdditionalItems = IndexTargets.size() + 2;
+ TransactionManager->Add(this);
+}
+ /*}}}*/
+pkgAcqMetaClearSig::~pkgAcqMetaClearSig() /*{{{*/
+{
+}
+ /*}}}*/
+// pkgAcqMetaClearSig::Custom600Headers - Insert custom request headers /*{{{*/
+string pkgAcqMetaClearSig::Custom600Headers() const
+{
+ string Header = pkgAcqMetaBase::Custom600Headers();
+ Header += "\nFail-Ignore: true";
+ return Header;
+}
+ /*}}}*/
+// pkgAcqMetaClearSig::Done - We got a file /*{{{*/
+void pkgAcqMetaClearSig::Done(std::string const &Message,
+ HashStringList const &Hashes,
+ pkgAcquire::MethodConfig const * const Cnf)
+{
+ Item::Done(Message, Hashes, Cnf);
+
+ // if we expect a ClearTextSignature (InRelease), ensure that
+ // this is what we get and if not fail to queue a
+ // Release/Release.gpg, see #346386
+ if (FileExists(DestFile) && !StartsWithGPGClearTextSignature(DestFile))
+ {
+ pkgAcquire::Item::Failed(Message, Cnf);
+ RenameOnError(NotClearsigned);
+ TransactionManager->AbortTransaction();
+ return;
+ }
+
+ if(AuthPass == false)
+ {
+ if(CheckDownloadDone(this, Message, Hashes) == true)
+ QueueForSignatureVerify(this, DestFile, DestFile);
+ return;
+ }
+ else if(CheckAuthDone(Message) == true)
+ {
+ if (TransactionManager->IMSHit == false)
+ TransactionManager->TransactionStageCopy(this, DestFile, GetFinalFilename());
+ else if (RealFileExists(GetFinalFilename()) == false)
+ {
+ // We got an InRelease file IMSHit, but we haven't one, which means
+ // we had a valid Release/Release.gpg combo stepping in, which we have
+ // to 'acquire' now to ensure list cleanup isn't removing them
+ new NoActionItem(Owner, DetachedDataTarget);
+ new NoActionItem(Owner, DetachedSigTarget);
+ }
+ }
+}
+ /*}}}*/
+void pkgAcqMetaClearSig::Failed(string const &Message,pkgAcquire::MethodConfig const * const Cnf) /*{{{*/
+{
+ Item::Failed(Message, Cnf);
+
+ // we failed, we will not get additional items from this method
+ ExpectedAdditionalItems = 0;
+
+ if (AuthPass == false)
+ {
+ // Queue the 'old' InRelease file for removal if we try Release.gpg
+ // as otherwise the file will stay around and gives a false-auth
+ // impression (CVE-2012-0214)
+ TransactionManager->TransactionStageRemoval(this, GetFinalFilename());
+ Status = StatDone;
+
+ new pkgAcqMetaIndex(Owner, TransactionManager, DetachedDataTarget, DetachedSigTarget, IndexTargets, TransactionManager->MetaIndexParser);
+ }
+ else
+ {
+ if(CheckStopAuthentication(this, Message))
+ return;
+
+ _error->Warning(_("The data from '%s' is not signed. Packages "
+ "from that repository can not be authenticated."),
+ ClearsignedTarget.Description.c_str());
+
+ // No Release file was present, or verification failed, so fall
+ // back to queueing Packages files without verification
+ // only allow going further if the users explicitely wants it
+ if(AllowInsecureRepositories(TransactionManager->MetaIndexParser, TransactionManager, this) == true)
+ {
+ Status = StatDone;
+
+ /* InRelease files become Release files, otherwise
+ * they would be considered as trusted later on */
+ string const FinalRelease = GetFinalFileNameFromURI(DetachedDataTarget.URI);
+ string const PartialRelease = GetPartialFileNameFromURI(DetachedDataTarget.URI);
+ string const FinalReleasegpg = GetFinalFileNameFromURI(DetachedSigTarget.URI);
+ string const FinalInRelease = GetFinalFilename();
+ Rename(DestFile, PartialRelease);
+ TransactionManager->TransactionStageCopy(this, PartialRelease, FinalRelease);
+
+ if (RealFileExists(FinalReleasegpg) || RealFileExists(FinalInRelease))
+ {
+ // open the last Release if we have it
+ if (TransactionManager->IMSHit == false)
+ {
+ TransactionManager->LastMetaIndexParser = new indexRecords;
+ _error->PushToStack();
+ if (RealFileExists(FinalInRelease))
+ TransactionManager->LastMetaIndexParser->Load(FinalInRelease);
+ else
+ TransactionManager->LastMetaIndexParser->Load(FinalRelease);
+ // its unlikely to happen, but if what we have is bad ignore it
+ if (_error->PendingError())
+ {
+ delete TransactionManager->LastMetaIndexParser;
+ TransactionManager->LastMetaIndexParser = NULL;
+ }
+ _error->RevertToStack();
+ }
+ }
+
+ // we parse the indexes here because at this point the user wanted
+ // a repository that may potentially harm him
+ if (TransactionManager->MetaIndexParser->Load(PartialRelease) == false || VerifyVendor(Message) == false)
+ /* expired Release files are still a problem you need extra force for */;
+ else
+ QueueIndexes(true);
+ }
+ }
+}
+ /*}}}*/
+
+pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire * const Owner, /*{{{*/
+ pkgAcqMetaBase * const TransactionManager,
+ IndexTarget const &DataTarget,
+ IndexTarget const &DetachedSigTarget,
+ vector<IndexTarget> const IndexTargets,
+ indexRecords * const MetaIndexParser) :
+ pkgAcqMetaBase(Owner, TransactionManager, IndexTargets, DataTarget, MetaIndexParser),
+ DetachedSigTarget(DetachedSigTarget)
+{
+ if(_config->FindB("Debug::Acquire::Transaction", false) == true)
+ std::clog << "New pkgAcqMetaIndex with TransactionManager "
+ << this->TransactionManager << std::endl;
+
+ DestFile = GetPartialFileNameFromURI(DataTarget.URI);
+
+ // Create the item
+ Desc.Description = DataTarget.Description;
+ Desc.Owner = this;
+ Desc.ShortDesc = DataTarget.ShortDesc;
+ Desc.URI = DataTarget.URI;
+
+ // we expect more item
+ ExpectedAdditionalItems = IndexTargets.size();
+ QueueURI(Desc);
+}
+ /*}}}*/
+void pkgAcqMetaIndex::Done(string const &Message, /*{{{*/
+ HashStringList const &Hashes,
+ pkgAcquire::MethodConfig const * const Cfg)
+{
+ Item::Done(Message,Hashes,Cfg);
+
+ if(CheckDownloadDone(this, Message, Hashes))
+ {
+ // we have a Release file, now download the Signature, all further
+ // verify/queue for additional downloads will be done in the
+ // pkgAcqMetaSig::Done() code
+ new pkgAcqMetaSig(Owner, TransactionManager, DetachedSigTarget, this);
+ }
+}
+ /*}}}*/
+// pkgAcqMetaIndex::Failed - no Release file present /*{{{*/
+void pkgAcqMetaIndex::Failed(string const &Message,
+ pkgAcquire::MethodConfig const * const Cnf)
+{
+ pkgAcquire::Item::Failed(Message, Cnf);
+ Status = StatDone;
+
+ _error->Warning(_("The repository '%s' does not have a Release file. "
+ "This is deprecated, please contact the owner of the "
+ "repository."), Target.Description.c_str());
+
+ // No Release file was present so fall
+ // back to queueing Packages files without verification
+ // only allow going further if the users explicitely wants it
+ if(AllowInsecureRepositories(TransactionManager->MetaIndexParser, TransactionManager, this) == true)
+ {
+ // ensure old Release files are removed
+ TransactionManager->TransactionStageRemoval(this, GetFinalFilename());
+ delete TransactionManager->MetaIndexParser;
+ TransactionManager->MetaIndexParser = NULL;
+
+ // queue without any kind of hashsum support
+ QueueIndexes(false);
+ }
+}
+ /*}}}*/
+void pkgAcqMetaIndex::Finished() /*{{{*/
+{
+ if(_config->FindB("Debug::Acquire::Transaction", false) == true)
+ std::clog << "Finished: " << DestFile <<std::endl;
+ if(TransactionManager != NULL &&
+ TransactionManager->TransactionHasError() == false)
+ TransactionManager->CommitTransaction();
+}
+ /*}}}*/
+std::string pkgAcqMetaIndex::DescURI() const /*{{{*/
+{
+ return Target.URI;
+}
+ /*}}}*/
+pkgAcqMetaIndex::~pkgAcqMetaIndex() {}
+
+// AcqMetaSig::AcqMetaSig - Constructor /*{{{*/
+pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire * const Owner,
+ pkgAcqMetaBase * const TransactionManager,
+ IndexTarget const Target,
+ pkgAcqMetaIndex * const MetaIndex) :
+ pkgAcqTransactionItem(Owner, TransactionManager, Target), MetaIndex(MetaIndex)
+{
+ DestFile = GetPartialFileNameFromURI(Target.URI);
+
+ // 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());
+
+ // set the TransactionManager
+ if(_config->FindB("Debug::Acquire::Transaction", false) == true)
+ std::clog << "New pkgAcqMetaSig with TransactionManager "
+ << TransactionManager << std::endl;
+
+ // Create the item
+ Desc.Description = Target.Description;
+ Desc.Owner = this;
+ Desc.ShortDesc = Target.ShortDesc;
+ Desc.URI = Target.URI;
+
+ // If we got a hit for Release, we will get one for Release.gpg too (or obscure errors),
+ // so we skip the download step and go instantly to verification
+ if (TransactionManager->IMSHit == true && RealFileExists(GetFinalFilename()))
+ {
+ Complete = true;
+ Status = StatDone;
+ PartialFile = DestFile = GetFinalFilename();
+ MetaIndexFileSignature = DestFile;
+ MetaIndex->QueueForSignatureVerify(this, MetaIndex->DestFile, DestFile);
+ }
+ else
+ QueueURI(Desc);
+}
+ /*}}}*/
+pkgAcqMetaSig::~pkgAcqMetaSig() /*{{{*/
+{
+}
+ /*}}}*/
+// AcqMetaSig::Done - The signature was downloaded/verified /*{{{*/
+void pkgAcqMetaSig::Done(string const &Message, HashStringList const &Hashes,
+ pkgAcquire::MethodConfig const * const Cfg)
+{
+ if (MetaIndexFileSignature.empty() == false)
+ {
+ DestFile = MetaIndexFileSignature;
+ MetaIndexFileSignature.clear();
+ }
+ Item::Done(Message, Hashes, Cfg);
+
+ if(MetaIndex->AuthPass == false)
+ {
+ if(MetaIndex->CheckDownloadDone(this, Message, Hashes) == true)
+ {
+ // destfile will be modified to point to MetaIndexFile for the
+ // gpgv method, so we need to save it here
+ MetaIndexFileSignature = DestFile;
+ MetaIndex->QueueForSignatureVerify(this, MetaIndex->DestFile, DestFile);
+ }
+ return;
+ }
+ else if(MetaIndex->CheckAuthDone(Message) == true)
+ {
+ if (TransactionManager->IMSHit == false)
+ {
+ TransactionManager->TransactionStageCopy(this, DestFile, GetFinalFilename());
+ TransactionManager->TransactionStageCopy(MetaIndex, MetaIndex->DestFile, MetaIndex->GetFinalFilename());
+ }
+ }
+}
+ /*}}}*/
+void pkgAcqMetaSig::Failed(string const &Message,pkgAcquire::MethodConfig const * const Cnf)/*{{{*/
+{
+ Item::Failed(Message,Cnf);
+
+ // check if we need to fail at this point
+ if (MetaIndex->AuthPass == true && MetaIndex->CheckStopAuthentication(this, Message))
+ return;
+
+ string const FinalRelease = MetaIndex->GetFinalFilename();
+ string const FinalReleasegpg = GetFinalFilename();
+ string const FinalInRelease = TransactionManager->GetFinalFilename();
+
+ if (RealFileExists(FinalReleasegpg) || RealFileExists(FinalInRelease))
+ {
+ std::string downgrade_msg;
+ strprintf(downgrade_msg, _("The repository '%s' is no longer signed."),
+ MetaIndex->Target.Description.c_str());
+ if(_config->FindB("Acquire::AllowDowngradeToInsecureRepositories"))
+ {
+ // meh, the users wants to take risks (we still mark the packages
+ // from this repository as unauthenticated)
+ _error->Warning("%s", downgrade_msg.c_str());
+ _error->Warning(_("This is normally not allowed, but the option "
+ "Acquire::AllowDowngradeToInsecureRepositories was "
+ "given to override it."));
+ Status = StatDone;
+ } else {
+ _error->Error("%s", downgrade_msg.c_str());
+ if (TransactionManager->IMSHit == false)
+ Rename(MetaIndex->DestFile, MetaIndex->DestFile + ".FAILED");
+ Item::Failed("Message: " + downgrade_msg, Cnf);
+ TransactionManager->AbortTransaction();
+ return;
+ }
+ }
+ else
+ _error->Warning(_("The data from '%s' is not signed. Packages "
+ "from that repository can not be authenticated."),
+ MetaIndex->Target.Description.c_str());
+
+ // ensures that a Release.gpg file in the lists/ is removed by the transaction
+ TransactionManager->TransactionStageRemoval(this, DestFile);
+
+ // only allow going further if the users explicitely wants it
+ if(AllowInsecureRepositories(TransactionManager->MetaIndexParser, TransactionManager, this) == true)
+ {
+ if (RealFileExists(FinalReleasegpg) || RealFileExists(FinalInRelease))
+ {
+ // open the last Release if we have it
+ if (TransactionManager->IMSHit == false)
+ {
+ TransactionManager->LastMetaIndexParser = new indexRecords;
+ _error->PushToStack();
+ if (RealFileExists(FinalInRelease))
+ TransactionManager->LastMetaIndexParser->Load(FinalInRelease);
+ else
+ TransactionManager->LastMetaIndexParser->Load(FinalRelease);
+ // its unlikely to happen, but if what we have is bad ignore it
+ if (_error->PendingError())
+ {
+ delete TransactionManager->LastMetaIndexParser;
+ TransactionManager->LastMetaIndexParser = NULL;
+ }
+ _error->RevertToStack();
+ }
+ }
+
+ // we parse the indexes here because at this point the user wanted
+ // a repository that may potentially harm him
+ if (TransactionManager->MetaIndexParser->Load(MetaIndex->DestFile) == false || MetaIndex->VerifyVendor(Message) == false)
+ /* expired Release files are still a problem you need extra force for */;
+ else
+ MetaIndex->QueueIndexes(true);
+
+ TransactionManager->TransactionStageCopy(MetaIndex, MetaIndex->DestFile, MetaIndex->GetFinalFilename());
+ }
+
+ // FIXME: this is used often (e.g. in pkgAcqIndexTrans) so refactor
+ if (Cnf->LocalOnly == true ||
+ StringToBool(LookupTag(Message,"Transient-Failure"),false) == false)
+ {
+ // Ignore this
+ Status = StatDone;
+ }
+}
+ /*}}}*/
+
+
+// AcqBaseIndex - Constructor /*{{{*/
+pkgAcqBaseIndex::pkgAcqBaseIndex(pkgAcquire * const Owner,
+ pkgAcqMetaBase * const TransactionManager,
+ IndexTarget const Target)
+: pkgAcqTransactionItem(Owner, TransactionManager, Target)
+{
+}
+ /*}}}*/
+pkgAcqBaseIndex::~pkgAcqBaseIndex() {}
+
// AcqDiffIndex::AcqDiffIndex - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* Get the DiffIndex file first and see if there are patches available
@@ -337,49 +1502,24 @@ void pkgAcquire::Item::ReportMirrorFailure(string FailCode)
* patches. If anything goes wrong in that process, it will fall back to
* the original packages file
*/
-pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner,
- pkgAcqMetaBase *TransactionManager,
- IndexTarget const * const Target,
- HashStringList const &ExpectedHashes,
- indexRecords *MetaIndexParser)
- : pkgAcqBaseIndex(Owner, TransactionManager, Target, ExpectedHashes,
- MetaIndexParser), PackagesFileReadyInPartial(false)
+pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire * const Owner,
+ pkgAcqMetaBase * const TransactionManager,
+ IndexTarget const Target)
+ : pkgAcqBaseIndex(Owner, TransactionManager, Target)
{
-
Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
- RealURI = Target->URI;
Desc.Owner = this;
- Desc.Description = Target->Description + ".diff/Index";
- Desc.ShortDesc = Target->ShortDesc;
- Desc.URI = Target->URI + ".diff/Index";
+ Desc.Description = Target.Description + ".diff/Index";
+ Desc.ShortDesc = Target.ShortDesc;
+ Desc.URI = Target.URI + ".diff/Index";
DestFile = GetPartialFileNameFromURI(Desc.URI);
if(Debug)
std::clog << "pkgAcqDiffIndex: " << Desc.URI << std::endl;
- // look for the current package file
- CurrentPackagesFile = _config->FindDir("Dir::State::lists");
- CurrentPackagesFile += URItoFileName(RealURI);
-
- // FIXME: this file:/ check is a hack to prevent fetching
- // from local sources. this is really silly, and
- // should be fixed cleanly as soon as possible
- if(!FileExists(CurrentPackagesFile) ||
- Desc.URI.substr(0,strlen("file:/")) == "file:/")
- {
- // we don't have a pkg file or we don't want to queue
- Failed("No index file, local or canceld by user", NULL);
- return;
- }
-
- if(Debug)
- std::clog << "pkgAcqDiffIndex::pkgAcqDiffIndex(): "
- << CurrentPackagesFile << std::endl;
-
QueueURI(Desc);
-
}
/*}}}*/
// AcqIndex::Custom600Headers - Insert custom request headers /*{{{*/
@@ -387,8 +1527,7 @@ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner,
/* The only header we use is the last-modified header. */
string pkgAcqDiffIndex::Custom600Headers() const
{
- string Final = _config->FindDir("Dir::State::lists");
- Final += URItoFileName(Desc.URI);
+ string const Final = GetFinalFilename();
if(Debug)
std::clog << "Custom600Header-IMS: " << Final << std::endl;
@@ -400,7 +1539,14 @@ string pkgAcqDiffIndex::Custom600Headers() const
return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
}
/*}}}*/
-bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/
+void pkgAcqDiffIndex::QueueOnIMSHit() const /*{{{*/
+{
+ // list cleanup needs to know that this file as well as the already
+ // present index is ours, so we create an empty diff to save it for us
+ new pkgAcqIndexDiffs(Owner, TransactionManager, Target);
+}
+ /*}}}*/
+bool pkgAcqDiffIndex::ParseDiffIndex(string const &IndexDiffFile) /*{{{*/
{
// failing here is fine: our caller will take care of trying to
// get the complete file if patching fails
@@ -447,37 +1593,42 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/
return false;
}
- if (ServerHashes != HashSums())
+ std::string const CurrentPackagesFile = GetFinalFileNameFromURI(Target.URI);
+ HashStringList const TargetFileHashes = GetExpectedHashesFor(Target.MetaKey);
+ if (TargetFileHashes.usable() == false || ServerHashes != TargetFileHashes)
{
if (Debug == true)
{
std::clog << "pkgAcqDiffIndex: " << IndexDiffFile << ": Index has different hashes than parser, probably older, so fail pdiffing" << std::endl;
- printHashSumComparision(CurrentPackagesFile, ServerHashes, HashSums());
+ printHashSumComparision(CurrentPackagesFile, ServerHashes, TargetFileHashes);
}
return false;
}
- if (ServerHashes.VerifyFile(CurrentPackagesFile) == true)
+ HashStringList LocalHashes;
+ // try avoiding calculating the hash here as this is costly
+ if (TransactionManager->LastMetaIndexParser != NULL)
+ LocalHashes = GetExpectedHashesFromFor(TransactionManager->LastMetaIndexParser, Target.MetaKey);
+ if (LocalHashes.usable() == false)
+ {
+ FileFd fd(CurrentPackagesFile, FileFd::ReadOnly);
+ Hashes LocalHashesCalc(ServerHashes);
+ LocalHashesCalc.AddFD(fd);
+ LocalHashes = LocalHashesCalc.GetHashStringList();
+ }
+
+ if (ServerHashes == LocalHashes)
{
// we have the same sha1 as the server so we are done here
if(Debug)
std::clog << "pkgAcqDiffIndex: Package file " << CurrentPackagesFile << " is up-to-date" << std::endl;
-
- // list cleanup needs to know that this file as well as the already
- // present index is ours, so we create an empty diff to save it for us
- new pkgAcqIndexDiffs(Owner, TransactionManager, Target,
- ExpectedHashes, MetaIndexParser);
+ QueueOnIMSHit();
return true;
}
- FileFd fd(CurrentPackagesFile, FileFd::ReadOnly);
- Hashes LocalHashesCalc;
- LocalHashesCalc.AddFD(fd);
- HashStringList const LocalHashes = LocalHashesCalc.GetHashStringList();
-
if(Debug)
std::clog << "Server-Current: " << ServerHashes.find(NULL)->toStr() << " and we start at "
- << fd.Name() << " " << fd.FileSize() << " " << LocalHashes.find(NULL)->toStr() << std::endl;
+ << CurrentPackagesFile << " " << LocalHashes.FileSize() << " " << LocalHashes.find(NULL)->toStr() << std::endl;
// parse all of (provided) history
vector<DiffInfo> available_patches;
@@ -506,7 +1657,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/
std::vector<DiffInfo>::iterator cur = available_patches.begin();
for (; cur != available_patches.end(); ++cur)
{
- if (cur->file != filename || unlikely(cur->result_size != size))
+ if (cur->file != filename)
continue;
cur->result_hashes.push_back(HashString(*type, hash));
break;
@@ -518,8 +1669,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/
DiffInfo next;
next.file = filename;
next.result_hashes.push_back(HashString(*type, hash));
- next.result_size = size;
- next.patch_size = 0;
+ next.result_hashes.FileSize(size);
available_patches.push_back(next);
}
else
@@ -567,10 +1717,9 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/
{
if (cur->file != filename)
continue;
- if (unlikely(cur->patch_size != 0 && cur->patch_size != size))
- continue;
+ if (cur->patch_hashes.empty())
+ cur->patch_hashes.FileSize(size);
cur->patch_hashes.push_back(HashString(*type, hash));
- cur->patch_size = size;
break;
}
if (cur != available_patches.end())
@@ -582,6 +1731,48 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/
}
}
+ for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type)
+ {
+ std::string tagname = *type;
+ tagname.append("-Download");
+ std::string const tmp = Tags.FindS(tagname.c_str());
+ if (tmp.empty() == true)
+ continue;
+
+ string hash, filename;
+ unsigned long long size;
+ std::stringstream ss(tmp);
+
+ // FIXME: all of pdiff supports only .gz compressed patches
+ while (ss >> hash >> size >> filename)
+ {
+ if (unlikely(hash.empty() == true || filename.empty() == true))
+ continue;
+ if (unlikely(APT::String::Endswith(filename, ".gz") == false))
+ continue;
+ filename.erase(filename.length() - 3);
+
+ // see if we have a record for this file already
+ std::vector<DiffInfo>::iterator cur = available_patches.begin();
+ for (; cur != available_patches.end(); ++cur)
+ {
+ if (cur->file != filename)
+ continue;
+ if (cur->download_hashes.empty())
+ cur->download_hashes.FileSize(size);
+ cur->download_hashes.push_back(HashString(*type, hash));
+ break;
+ }
+ if (cur != available_patches.end())
+ continue;
+ if (Debug == true)
+ std::clog << "pkgAcqDiffIndex: " << IndexDiffFile << ": File " << filename
+ << " wasn't in the list for the first parsed hash! (download)" << std::endl;
+ break;
+ }
+ }
+
+
bool foundStart = false;
for (std::vector<DiffInfo>::iterator cur = available_patches.begin();
cur != available_patches.end(); ++cur)
@@ -617,9 +1808,9 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/
unsigned long long patchesSize = 0;
for (std::vector<DiffInfo>::const_iterator cur = available_patches.begin();
cur != available_patches.end(); ++cur)
- patchesSize += cur->patch_size;
+ patchesSize += cur->patch_hashes.FileSize();
unsigned long long const sizeLimit = ServerSize * _config->FindI("Acquire::PDiffs::SizeLimit", 100);
- if (false && sizeLimit > 0 && (sizeLimit/100) < patchesSize)
+ if (sizeLimit > 0 && (sizeLimit/100) < patchesSize)
{
if (Debug)
std::clog << "Need " << patchesSize << " bytes (Limit is " << sizeLimit/100
@@ -627,20 +1818,6 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/
return false;
}
- // FIXME: make this use the method
- PackagesFileReadyInPartial = true;
- std::string const Partial = GetPartialFileNameFromURI(RealURI);
-
- FileFd From(CurrentPackagesFile, FileFd::ReadOnly);
- FileFd To(Partial, FileFd::WriteEmpty);
- if(CopyFile(From, To) == false)
- return _error->Errno("CopyFile", "failed to copy");
-
- if(Debug)
- std::cerr << "Done copying " << CurrentPackagesFile
- << " -> " << Partial
- << std::endl;
-
// we have something, queue the diffs
string::size_type const last_space = Description.rfind(" ");
if(last_space != string::npos)
@@ -660,18 +1837,13 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/
}
if (pdiff_merge == false)
- {
- new pkgAcqIndexDiffs(Owner, TransactionManager, Target, ExpectedHashes,
- MetaIndexParser, available_patches);
- }
+ new pkgAcqIndexDiffs(Owner, TransactionManager, Target, available_patches);
else
{
std::vector<pkgAcqIndexMergeDiffs*> *diffs = new std::vector<pkgAcqIndexMergeDiffs*>(available_patches.size());
for(size_t i = 0; i < available_patches.size(); ++i)
(*diffs)[i] = new pkgAcqIndexMergeDiffs(Owner, TransactionManager,
Target,
- ExpectedHashes,
- MetaIndexParser,
available_patches[i],
diffs);
}
@@ -682,7 +1854,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/
return true;
}
/*}}}*/
-void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig * Cnf)/*{{{*/
+void pkgAcqDiffIndex::Failed(string const &Message,pkgAcquire::MethodConfig const * const Cnf)/*{{{*/
{
Item::Failed(Message,Cnf);
Status = StatDone;
@@ -691,90 +1863,87 @@ void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig * Cnf)/*{{{
std::clog << "pkgAcqDiffIndex failed: " << Desc.URI << " with " << Message << std::endl
<< "Falling back to normal index file acquire" << std::endl;
- new pkgAcqIndex(Owner, TransactionManager, Target, ExpectedHashes, MetaIndexParser);
+ new pkgAcqIndex(Owner, TransactionManager, Target);
}
/*}}}*/
-void pkgAcqDiffIndex::Done(string Message,unsigned long long Size,HashStringList const &Hashes, /*{{{*/
- pkgAcquire::MethodConfig *Cnf)
+void pkgAcqDiffIndex::Done(string const &Message,HashStringList const &Hashes, /*{{{*/
+ pkgAcquire::MethodConfig const * const Cnf)
{
if(Debug)
std::clog << "pkgAcqDiffIndex::Done(): " << Desc.URI << std::endl;
- Item::Done(Message, Size, Hashes, Cnf);
-
- // verify the index target
- if(Target && Target->MetaKey != "" && MetaIndexParser && Hashes.usable())
- {
- std::string IndexMetaKey = Target->MetaKey + ".diff/Index";
- indexRecords::checkSum *Record = MetaIndexParser->Lookup(IndexMetaKey);
- if(Record && Record->Hashes.usable() && Hashes != Record->Hashes)
- {
- RenameOnError(HashSumMismatch);
- printHashSumComparision(RealURI, Record->Hashes, Hashes);
- Failed(Message, Cnf);
- return;
- }
-
- }
-
- string FinalFile;
- FinalFile = _config->FindDir("Dir::State::lists");
- FinalFile += URItoFileName(Desc.URI);
+ Item::Done(Message, Hashes, Cnf);
+ string const FinalFile = GetFinalFilename();
if(StringToBool(LookupTag(Message,"IMS-Hit"),false))
DestFile = FinalFile;
- if(!ParseDiffIndex(DestFile))
- return Failed("Message: Couldn't parse pdiff index", Cnf);
+ if(ParseDiffIndex(DestFile) == false)
+ {
+ Failed("Message: Couldn't parse pdiff index", Cnf);
+ // queue for final move - this should happen even if we fail
+ // while parsing (e.g. on sizelimit) and download the complete file.
+ TransactionManager->TransactionStageCopy(this, DestFile, FinalFile);
+ return;
+ }
- // queue for final move
TransactionManager->TransactionStageCopy(this, DestFile, FinalFile);
Complete = true;
Status = StatDone;
Dequeue();
+
return;
}
/*}}}*/
+pkgAcqDiffIndex::~pkgAcqDiffIndex() {}
+
// AcqIndexDiffs::AcqIndexDiffs - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* The package diff is added to the queue. one object is constructed
* for each diff and the index
*/
-pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner,
- pkgAcqMetaBase *TransactionManager,
- struct IndexTarget const * const Target,
- HashStringList const &ExpectedHashes,
- indexRecords *MetaIndexParser,
- vector<DiffInfo> diffs)
- : pkgAcqBaseIndex(Owner, TransactionManager, Target, ExpectedHashes, MetaIndexParser),
+pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire * const Owner,
+ pkgAcqMetaBase * const TransactionManager,
+ IndexTarget const Target,
+ vector<DiffInfo> const &diffs)
+ : pkgAcqBaseIndex(Owner, TransactionManager, Target),
available_patches(diffs)
{
- DestFile = GetPartialFileNameFromURI(Target->URI);
+ DestFile = GetPartialFileNameFromURI(Target.URI);
Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
- RealURI = Target->URI;
Desc.Owner = this;
- Description = Target->Description;
- Desc.ShortDesc = Target->ShortDesc;
+ Description = Target.Description;
+ Desc.ShortDesc = Target.ShortDesc;
if(available_patches.empty() == true)
{
// we are done (yeah!), check hashes against the final file
- DestFile = _config->FindDir("Dir::State::lists");
- DestFile += URItoFileName(Target->URI);
+ DestFile = GetFinalFileNameFromURI(Target.URI);
Finish(true);
}
else
{
+ // patching needs to be bootstrapped with the 'old' version
+ std::string const PartialFile = GetPartialFileNameFromURI(Target.URI);
+ if (RealFileExists(PartialFile) == false)
+ {
+ if (symlink(GetFinalFilename().c_str(), PartialFile.c_str()) != 0)
+ {
+ Failed("Link creation of " + PartialFile + " to " + GetFinalFilename() + " failed", NULL);
+ return;
+ }
+ }
+
// get the next diff
State = StateFetchDiff;
QueueNextDiff();
}
}
/*}}}*/
-void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig * Cnf)/*{{{*/
+void pkgAcqIndexDiffs::Failed(string const &Message,pkgAcquire::MethodConfig const * const Cnf)/*{{{*/
{
Item::Failed(Message,Cnf);
Status = StatDone;
@@ -782,7 +1951,12 @@ void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig * Cnf)/*{{
if(Debug)
std::clog << "pkgAcqIndexDiffs failed: " << Desc.URI << " with " << Message << std::endl
<< "Falling back to normal index file acquire" << std::endl;
- new pkgAcqIndex(Owner, TransactionManager, Target, ExpectedHashes, MetaIndexParser);
+ DestFile = GetPartialFileNameFromURI(Target.URI);
+ RenameOnError(PDiffError);
+ std::string const patchname = GetDiffsPatchFileName(DestFile);
+ if (RealFileExists(patchname))
+ rename(patchname.c_str(), std::string(patchname + ".FAILED").c_str());
+ new pkgAcqIndex(Owner, TransactionManager, Target);
Finish();
}
/*}}}*/
@@ -796,19 +1970,9 @@ void pkgAcqIndexDiffs::Finish(bool allDone)
// we restore the original name, this is required, otherwise
// the file will be cleaned
- if(allDone)
+ if(allDone)
{
- if(HashSums().usable() && !HashSums().VerifyFile(DestFile))
- {
- RenameOnError(HashSumMismatch);
- Dequeue();
- return;
- }
-
- // queue for copy
- std::string FinalFile = _config->FindDir("Dir::State::lists");
- FinalFile += URItoFileName(RealURI);
- TransactionManager->TransactionStageCopy(this, DestFile, FinalFile);
+ TransactionManager->TransactionStageCopy(this, DestFile, GetFinalFilename());
// this is for the "real" finish
Complete = true;
@@ -830,7 +1994,7 @@ void pkgAcqIndexDiffs::Finish(bool allDone)
bool pkgAcqIndexDiffs::QueueNextDiff() /*{{{*/
{
// calc sha1 of the just patched file
- std::string const FinalFile = GetPartialFileNameFromURI(RealURI);
+ std::string const FinalFile = GetPartialFileNameFromURI(Target.URI);
if(!FileExists(FinalFile))
{
@@ -846,7 +2010,8 @@ bool pkgAcqIndexDiffs::QueueNextDiff() /*{{{*/
if(Debug)
std::clog << "QueueNextDiff: " << FinalFile << " (" << LocalHashes.find(NULL)->toStr() << ")" << std::endl;
- if (unlikely(LocalHashes.usable() == false || ExpectedHashes.usable() == false))
+ HashStringList const TargetFileHashes = GetExpectedHashesFor(Target.MetaKey);
+ if (unlikely(LocalHashes.usable() == false || TargetFileHashes.usable() == false))
{
Failed("Local/Expected hashes are not usable", NULL);
return false;
@@ -854,7 +2019,7 @@ bool pkgAcqIndexDiffs::QueueNextDiff() /*{{{*/
// final file reached before all patches are applied
- if(LocalHashes == ExpectedHashes)
+ if(LocalHashes == TargetFileHashes)
{
Finish(true);
return true;
@@ -879,9 +2044,9 @@ bool pkgAcqIndexDiffs::QueueNextDiff() /*{{{*/
}
// queue the right diff
- Desc.URI = RealURI + ".diff/" + available_patches[0].file + ".gz";
+ Desc.URI = Target.URI + ".diff/" + available_patches[0].file + ".gz";
Desc.Description = Description + " " + available_patches[0].file + string(".pdiff");
- DestFile = GetPartialFileNameFromURI(RealURI + ".diff/" + available_patches[0].file);
+ DestFile = GetPartialFileNameFromURI(Target.URI + ".diff/" + available_patches[0].file);
if(Debug)
std::clog << "pkgAcqIndexDiffs::QueueNextDiff(): " << Desc.URI << std::endl;
@@ -891,34 +2056,21 @@ bool pkgAcqIndexDiffs::QueueNextDiff() /*{{{*/
return true;
}
/*}}}*/
-void pkgAcqIndexDiffs::Done(string Message,unsigned long long Size, HashStringList const &Hashes, /*{{{*/
- pkgAcquire::MethodConfig *Cnf)
+void pkgAcqIndexDiffs::Done(string const &Message, HashStringList const &Hashes, /*{{{*/
+ pkgAcquire::MethodConfig const * const Cnf)
{
if(Debug)
std::clog << "pkgAcqIndexDiffs::Done(): " << Desc.URI << std::endl;
- Item::Done(Message, Size, Hashes, Cnf);
+ Item::Done(Message, Hashes, Cnf);
- // FIXME: verify this download too before feeding it to rred
- std::string const FinalFile = GetPartialFileNameFromURI(RealURI);
+ std::string const FinalFile = GetPartialFileNameFromURI(Target.URI);
+ std::string const PatchFile = GetDiffsPatchFileName(FinalFile);
// success in downloading a diff, enter ApplyDiff state
if(State == StateFetchDiff)
{
- FileFd fd(DestFile, FileFd::ReadOnly, FileFd::Gzip);
- class Hashes LocalHashesCalc;
- LocalHashesCalc.AddFD(fd);
- HashStringList const LocalHashes = LocalHashesCalc.GetHashStringList();
-
- if (fd.Size() != available_patches[0].patch_size ||
- available_patches[0].patch_hashes != LocalHashes)
- {
- Failed("Patch has Size/Hashsum mismatch", NULL);
- return;
- }
-
- // rred excepts the patch as $FinalFile.ed
- Rename(DestFile,FinalFile+".ed");
+ Rename(DestFile, PatchFile);
if(Debug)
std::clog << "Sending to rred method: " << FinalFile << std::endl;
@@ -929,18 +2081,17 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long long Size, HashStringLi
QueueURI(Desc);
SetActiveSubprocess("rred");
return;
- }
-
+ }
// success in download/apply a diff, queue next (if needed)
if(State == StateApplyDiff)
{
// remove the just applied patch
available_patches.erase(available_patches.begin());
- unlink((FinalFile + ".ed").c_str());
+ unlink(PatchFile.c_str());
// move into place
- if(Debug)
+ if(Debug)
{
std::clog << "Moving patched file in place: " << std::endl
<< DestFile << " -> " << FinalFile << std::endl;
@@ -951,7 +2102,6 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long long Size, HashStringLi
// see if there is more to download
if(available_patches.empty() == false) {
new pkgAcqIndexDiffs(Owner, TransactionManager, Target,
- ExpectedHashes, MetaIndexParser,
available_patches);
return Finish();
} else
@@ -961,28 +2111,39 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long long Size, HashStringLi
}
}
/*}}}*/
+std::string pkgAcqIndexDiffs::Custom600Headers() const /*{{{*/
+{
+ if(State != StateApplyDiff)
+ return pkgAcqBaseIndex::Custom600Headers();
+ std::ostringstream patchhashes;
+ HashStringList const ExpectedHashes = available_patches[0].patch_hashes;
+ for (HashStringList::const_iterator hs = ExpectedHashes.begin(); hs != ExpectedHashes.end(); ++hs)
+ patchhashes << "\nPatch-0-" << hs->HashType() << "-Hash: " << hs->HashValue();
+ patchhashes << pkgAcqBaseIndex::Custom600Headers();
+ return patchhashes.str();
+}
+ /*}}}*/
+pkgAcqIndexDiffs::~pkgAcqIndexDiffs() {}
+
// AcqIndexMergeDiffs::AcqIndexMergeDiffs - Constructor /*{{{*/
-pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire *Owner,
- pkgAcqMetaBase *TransactionManager,
- struct IndexTarget const * const Target,
- HashStringList const &ExpectedHashes,
- indexRecords *MetaIndexParser,
+pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire * const Owner,
+ pkgAcqMetaBase * const TransactionManager,
+ IndexTarget const Target,
DiffInfo const &patch,
std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches)
- : pkgAcqBaseIndex(Owner, TransactionManager, Target, ExpectedHashes, MetaIndexParser),
+ : pkgAcqBaseIndex(Owner, TransactionManager, Target),
patch(patch), allPatches(allPatches), State(StateFetchDiff)
{
Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
- RealURI = Target->URI;
Desc.Owner = this;
- Description = Target->Description;
- Desc.ShortDesc = Target->ShortDesc;
+ Description = Target.Description;
+ Desc.ShortDesc = Target.ShortDesc;
- Desc.URI = RealURI + ".diff/" + patch.file + ".gz";
+ Desc.URI = Target.URI + ".diff/" + patch.file + ".gz";
Desc.Description = Description + " " + patch.file + string(".pdiff");
- DestFile = GetPartialFileNameFromURI(RealURI + ".diff/" + patch.file);
+ DestFile = GetPartialFileNameFromURI(Target.URI + ".diff/" + patch.file);
if(Debug)
std::clog << "pkgAcqIndexMergeDiffs: " << Desc.URI << std::endl;
@@ -990,7 +2151,7 @@ pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire *Owner,
QueueURI(Desc);
}
/*}}}*/
-void pkgAcqIndexMergeDiffs::Failed(string Message,pkgAcquire::MethodConfig * Cnf)/*{{{*/
+void pkgAcqIndexMergeDiffs::Failed(string const &Message,pkgAcquire::MethodConfig const * const Cnf)/*{{{*/
{
if(Debug)
std::clog << "pkgAcqIndexMergeDiffs failed: " << Desc.URI << " with " << Message << std::endl;
@@ -1007,36 +2168,28 @@ void pkgAcqIndexMergeDiffs::Failed(string Message,pkgAcquire::MethodConfig * Cnf
// first failure means we should fallback
State = StateErrorDiff;
- std::clog << "Falling back to normal index file acquire" << std::endl;
- new pkgAcqIndex(Owner, TransactionManager, Target, ExpectedHashes, MetaIndexParser);
+ if (Debug)
+ std::clog << "Falling back to normal index file acquire" << std::endl;
+ DestFile = GetPartialFileNameFromURI(Target.URI);
+ RenameOnError(PDiffError);
+ std::string const patchname = GetMergeDiffsPatchFileName(DestFile, patch.file);
+ if (RealFileExists(patchname))
+ rename(patchname.c_str(), std::string(patchname + ".FAILED").c_str());
+ new pkgAcqIndex(Owner, TransactionManager, Target);
}
/*}}}*/
-void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,HashStringList const &Hashes, /*{{{*/
- pkgAcquire::MethodConfig *Cnf)
+void pkgAcqIndexMergeDiffs::Done(string const &Message, HashStringList const &Hashes, /*{{{*/
+ pkgAcquire::MethodConfig const * const Cnf)
{
if(Debug)
std::clog << "pkgAcqIndexMergeDiffs::Done(): " << Desc.URI << std::endl;
- Item::Done(Message,Size,Hashes,Cnf);
-
- // FIXME: verify download before feeding it to rred
- string const FinalFile = GetPartialFileNameFromURI(RealURI);
+ Item::Done(Message, Hashes, Cnf);
+ string const FinalFile = GetPartialFileNameFromURI(Target.URI);
if (State == StateFetchDiff)
{
- FileFd fd(DestFile, FileFd::ReadOnly, FileFd::Gzip);
- class Hashes LocalHashesCalc;
- LocalHashesCalc.AddFD(fd);
- HashStringList const LocalHashes = LocalHashesCalc.GetHashStringList();
-
- if (fd.Size() != patch.patch_size || patch.patch_hashes != LocalHashes)
- {
- Failed("Patch has Size/Hashsum mismatch", NULL);
- return;
- }
-
- // rred expects the patch as $FinalFile.ed.$patchname.gz
- Rename(DestFile, FinalFile + ".ed." + patch.file + ".gz");
+ Rename(DestFile, GetMergeDiffsPatchFileName(FinalFile, patch.file));
// check if this is the last completed diff
State = StateDoneDiff;
@@ -1052,6 +2205,13 @@ void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,HashStri
// this is the last completed diff, so we are ready to apply now
State = StateApplyDiff;
+ // patching needs to be bootstrapped with the 'old' version
+ if (symlink(GetFinalFilename().c_str(), FinalFile.c_str()) != 0)
+ {
+ Failed("Link creation of " + FinalFile + " to " + GetFinalFilename() + " failed", NULL);
+ return;
+ }
+
if(Debug)
std::clog << "Sending to rred method: " << FinalFile << std::endl;
@@ -1064,33 +2224,24 @@ void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,HashStri
// success in download/apply all diffs, clean up
else if (State == StateApplyDiff)
{
- // see if we really got the expected file
- if(ExpectedHashes.usable() && !ExpectedHashes.VerifyFile(DestFile))
- {
- RenameOnError(HashSumMismatch);
- return;
- }
-
-
- std::string FinalFile = _config->FindDir("Dir::State::lists");
- FinalFile += URItoFileName(RealURI);
-
// move the result into place
+ std::string const Final = GetFinalFilename();
if(Debug)
std::clog << "Queue patched file in place: " << std::endl
- << DestFile << " -> " << FinalFile << std::endl;
+ << DestFile << " -> " << Final << std::endl;
// queue for copy by the transaction manager
- TransactionManager->TransactionStageCopy(this, DestFile, FinalFile);
+ TransactionManager->TransactionStageCopy(this, DestFile, Final);
// ensure the ed's are gone regardless of list-cleanup
for (std::vector<pkgAcqIndexMergeDiffs *>::const_iterator I = allPatches->begin();
I != allPatches->end(); ++I)
{
- std::string const PartialFile = GetPartialFileNameFromURI(RealURI);
- std::string patch = PartialFile + ".ed." + (*I)->patch.file + ".gz";
+ std::string const PartialFile = GetPartialFileNameFromURI(Target.URI);
+ std::string const patch = GetMergeDiffsPatchFileName(PartialFile, (*I)->patch.file);
unlink(patch.c_str());
}
+ unlink(FinalFile.c_str());
// all set and done
Complete = true;
@@ -1099,54 +2250,35 @@ void pkgAcqIndexMergeDiffs::Done(string Message,unsigned long long Size,HashStri
}
}
/*}}}*/
-// AcqBaseIndex::VerifyHashByMetaKey - verify hash for the given metakey /*{{{*/
-bool pkgAcqBaseIndex::VerifyHashByMetaKey(HashStringList const &Hashes)
+std::string pkgAcqIndexMergeDiffs::Custom600Headers() const /*{{{*/
{
- if(MetaKey != "" && Hashes.usable())
+ if(State != StateApplyDiff)
+ return pkgAcqBaseIndex::Custom600Headers();
+ std::ostringstream patchhashes;
+ unsigned int seen_patches = 0;
+ for (std::vector<pkgAcqIndexMergeDiffs *>::const_iterator I = allPatches->begin();
+ I != allPatches->end(); ++I)
{
- indexRecords::checkSum *Record = MetaIndexParser->Lookup(MetaKey);
- if(Record && Record->Hashes.usable() && Hashes != Record->Hashes)
- {
- printHashSumComparision(RealURI, Record->Hashes, Hashes);
- return false;
- }
+ HashStringList const ExpectedHashes = (*I)->patch.patch_hashes;
+ for (HashStringList::const_iterator hs = ExpectedHashes.begin(); hs != ExpectedHashes.end(); ++hs)
+ patchhashes << "\nPatch-" << seen_patches << "-" << hs->HashType() << "-Hash: " << hs->HashValue();
+ ++seen_patches;
}
- return true;
+ patchhashes << pkgAcqBaseIndex::Custom600Headers();
+ return patchhashes.str();
}
/*}}}*/
-// AcqIndex::AcqIndex - Constructor /*{{{*/
-// ---------------------------------------------------------------------
-/* The package file is added to the queue and a second class is
- instantiated to fetch the revision file */
-pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner,
- string URI,string URIDesc,string ShortDesc,
- HashStringList const &ExpectedHash)
- : pkgAcqBaseIndex(Owner, 0, NULL, ExpectedHash, NULL)
-{
- RealURI = URI;
+pkgAcqIndexMergeDiffs::~pkgAcqIndexMergeDiffs() {}
- AutoSelectCompression();
- Init(URI, URIDesc, ShortDesc);
-
- if(_config->FindB("Debug::Acquire::Transaction", false) == true)
- std::clog << "New pkgIndex with TransactionManager "
- << TransactionManager << std::endl;
-}
- /*}}}*/
// AcqIndex::AcqIndex - Constructor /*{{{*/
-pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner,
- pkgAcqMetaBase *TransactionManager,
- IndexTarget const *Target,
- HashStringList const &ExpectedHash,
- indexRecords *MetaIndexParser)
- : pkgAcqBaseIndex(Owner, TransactionManager, Target, ExpectedHash,
- MetaIndexParser)
+pkgAcqIndex::pkgAcqIndex(pkgAcquire * const Owner,
+ pkgAcqMetaBase * const TransactionManager,
+ IndexTarget const Target)
+ : pkgAcqBaseIndex(Owner, TransactionManager, Target)
{
- RealURI = Target->URI;
-
// autoselect the compression method
AutoSelectCompression();
- Init(Target->URI, Target->Description, Target->ShortDesc);
+ Init(Target.URI, Target.Description, Target.ShortDesc);
if(_config->FindB("Debug::Acquire::Transaction", false) == true)
std::clog << "New pkgIndex with TransactionManager "
@@ -1158,14 +2290,14 @@ void pkgAcqIndex::AutoSelectCompression()
{
std::vector<std::string> types = APT::Configuration::getCompressionTypes();
CompressionExtensions = "";
- if (ExpectedHashes.usable())
+ if (TransactionManager->MetaIndexParser != NULL && TransactionManager->MetaIndexParser->Exists(Target.MetaKey))
{
for (std::vector<std::string>::const_iterator t = types.begin();
t != types.end(); ++t)
{
- std::string CompressedMetaKey = string(Target->MetaKey).append(".").append(*t);
+ std::string CompressedMetaKey = string(Target.MetaKey).append(".").append(*t);
if (*t == "uncompressed" ||
- MetaIndexParser->Exists(CompressedMetaKey) == true)
+ TransactionManager->MetaIndexParser->Exists(CompressedMetaKey) == true)
CompressionExtensions.append(*t).append(" ");
}
}
@@ -1186,30 +2318,32 @@ void pkgAcqIndex::Init(string const &URI, string const &URIDesc,
DestFile = GetPartialFileNameFromURI(URI);
- CurrentCompressionExtension = CompressionExtensions.substr(0, CompressionExtensions.find(' '));
+ size_t const nextExt = CompressionExtensions.find(' ');
+ if (nextExt == std::string::npos)
+ {
+ CurrentCompressionExtension = CompressionExtensions;
+ CompressionExtensions.clear();
+ }
+ else
+ {
+ CurrentCompressionExtension = CompressionExtensions.substr(0, nextExt);
+ CompressionExtensions = CompressionExtensions.substr(nextExt+1);
+ }
+
if (CurrentCompressionExtension == "uncompressed")
{
Desc.URI = URI;
- if(Target)
- MetaKey = string(Target->MetaKey);
}
+ else if (unlikely(CurrentCompressionExtension.empty()))
+ return;
else
{
Desc.URI = URI + '.' + CurrentCompressionExtension;
DestFile = DestFile + '.' + CurrentCompressionExtension;
- if(Target)
- MetaKey = string(Target->MetaKey) + '.' + CurrentCompressionExtension;
}
- // load the filesize
- if(MetaIndexParser)
- {
- indexRecords::checkSum *Record = MetaIndexParser->Lookup(MetaKey);
- if(Record)
- FileSize = Record->Size;
-
- InitByHashIfNeeded(MetaKey);
- }
+ if(TransactionManager->MetaIndexParser != NULL)
+ InitByHashIfNeeded();
Desc.Description = URIDesc;
Desc.Owner = this;
@@ -1219,7 +2353,7 @@ void pkgAcqIndex::Init(string const &URI, string const &URIDesc,
}
/*}}}*/
// AcqIndex::AdjustForByHash - modify URI for by-hash support /*{{{*/
-void pkgAcqIndex::InitByHashIfNeeded(const std::string MetaKey)
+void pkgAcqIndex::InitByHashIfNeeded()
{
// TODO:
// - (maybe?) add support for by-hash into the sources.list as flag
@@ -1227,15 +2361,15 @@ void pkgAcqIndex::InitByHashIfNeeded(const std::string MetaKey)
std::string HostKnob = "APT::Acquire::" + ::URI(Desc.URI).Host + "::By-Hash";
if(_config->FindB("APT::Acquire::By-Hash", false) == true ||
_config->FindB(HostKnob, false) == true ||
- MetaIndexParser->GetSupportsAcquireByHash())
+ TransactionManager->MetaIndexParser->GetSupportsAcquireByHash())
{
- indexRecords::checkSum *Record = MetaIndexParser->Lookup(MetaKey);
- if(Record)
+ HashStringList const Hashes = GetExpectedHashes();
+ if(Hashes.usable())
{
// FIXME: should we really use the best hash here? or a fixed one?
- const HashString *TargetHash = Record->Hashes.find("");
- std::string ByHash = "/by-hash/" + TargetHash->HashType() + "/" + TargetHash->HashValue();
- size_t trailing_slash = Desc.URI.find_last_of("/");
+ HashString const * const TargetHash = Hashes.find("");
+ std::string const ByHash = "/by-hash/" + TargetHash->HashType() + "/" + TargetHash->HashValue();
+ size_t const trailing_slash = Desc.URI.find_last_of("/");
Desc.URI = Desc.URI.replace(
trailing_slash,
Desc.URI.substr(trailing_slash+1).size()+1,
@@ -1243,7 +2377,7 @@ void pkgAcqIndex::InitByHashIfNeeded(const std::string MetaKey)
} else {
_error->Warning(
"Fetching ByHash requested but can not find record for %s",
- MetaKey.c_str());
+ GetMetaKey().c_str());
}
}
}
@@ -1260,54 +2394,40 @@ string pkgAcqIndex::Custom600Headers() const
if (stat(Final.c_str(),&Buf) == 0)
msg += "\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
- if(Target->IsOptional())
+ if(Target.IsOptional)
msg += "\nFail-Ignore: true";
return msg;
}
/*}}}*/
-// pkgAcqIndex::Failed - getting the indexfile failed /*{{{*/
-void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
+// AcqIndex::Failed - getting the indexfile failed /*{{{*/
+void pkgAcqIndex::Failed(string const &Message,pkgAcquire::MethodConfig const * const Cnf)
{
Item::Failed(Message,Cnf);
- size_t const nextExt = CompressionExtensions.find(' ');
- if (nextExt != std::string::npos)
- {
- CompressionExtensions = CompressionExtensions.substr(nextExt+1);
- Init(RealURI, Desc.Description, Desc.ShortDesc);
- Status = StatIdle;
- return;
- }
-
- // on decompression failure, remove bad versions in partial/
- if (Stage == STAGE_DECOMPRESS_AND_VERIFY)
+ // authorisation matches will not be fixed by other compression types
+ if (Status != StatAuthError)
{
- unlink(EraseFileName.c_str());
+ if (CompressionExtensions.empty() == false)
+ {
+ Init(Target.URI, Desc.Description, Desc.ShortDesc);
+ Status = StatIdle;
+ return;
+ }
}
- Item::Failed(Message,Cnf);
-
- if(Target->IsOptional() && ExpectedHashes.empty() && Stage == STAGE_DOWNLOAD)
+ if(Target.IsOptional && GetExpectedHashes().empty() && Stage == STAGE_DOWNLOAD)
Status = StatDone;
else
TransactionManager->AbortTransaction();
}
/*}}}*/
-// pkgAcqIndex::GetFinalFilename - Return the full final file path /*{{{*/
-std::string pkgAcqIndex::GetFinalFilename() const
-{
- std::string FinalFile = _config->FindDir("Dir::State::lists");
- FinalFile += URItoFileName(RealURI);
- return GetCompressedFileName(RealURI, FinalFile, CurrentCompressionExtension);
-}
- /*}}}*/
// AcqIndex::ReverifyAfterIMS - Reverify index after an ims-hit /*{{{*/
void pkgAcqIndex::ReverifyAfterIMS()
{
// update destfile to *not* include the compression extension when doing
// a reverify (as its uncompressed on disk already)
- DestFile = GetCompressedFileName(RealURI, GetPartialFileNameFromURI(RealURI), CurrentCompressionExtension);
+ DestFile = GetCompressedFileName(Target.URI, GetPartialFileNameFromURI(Target.URI), CurrentCompressionExtension);
// copy FinalFile into partial/ so that we check the hash again
string FinalFile = GetFinalFilename();
@@ -1316,33 +2436,6 @@ void pkgAcqIndex::ReverifyAfterIMS()
QueueURI(Desc);
}
/*}}}*/
-// AcqIndex::ValidateFile - Validate the content of the downloaded file /*{{{*/
-bool pkgAcqIndex::ValidateFile(const std::string &FileName)
-{
- // FIXME: this can go away once we only ever download stuff that
- // has a valid hash and we never do GET based probing
- // FIXME2: this also leaks debian-isms into the code and should go therefore
-
- /* Always validate the index file for correctness (all indexes must
- * have a Package field) (LP: #346386) (Closes: #627642)
- */
- FileFd fd(FileName, FileFd::ReadOnly, FileFd::Extension);
- // Only test for correctness if the content of the file is not empty
- // (empty is ok)
- if (fd.Size() > 0)
- {
- pkgTagSection sec;
- pkgTagFile tag(&fd);
-
- // all our current indexes have a field 'Package' in each section
- if (_error->PendingError() == true ||
- tag.Step(sec) == false ||
- sec.Exists("Package") == false)
- return false;
- }
- return true;
-}
- /*}}}*/
// AcqIndex::Done - Finished a fetch /*{{{*/
// ---------------------------------------------------------------------
/* This goes through a number of states.. On the initial fetch the
@@ -1350,12 +2443,11 @@ bool pkgAcqIndex::ValidateFile(const std::string &FileName)
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 compressed uri. */
-void pkgAcqIndex::Done(string Message,
- unsigned long long Size,
+void pkgAcqIndex::Done(string const &Message,
HashStringList const &Hashes,
- pkgAcquire::MethodConfig *Cfg)
+ pkgAcquire::MethodConfig const * const Cfg)
{
- Item::Done(Message,Size,Hashes,Cfg);
+ Item::Done(Message,Hashes,Cfg);
switch(Stage)
{
@@ -1369,19 +2461,9 @@ void pkgAcqIndex::Done(string Message,
}
/*}}}*/
// AcqIndex::StageDownloadDone - Queue for decompress and verify /*{{{*/
-void pkgAcqIndex::StageDownloadDone(string Message,
- HashStringList const &Hashes,
- pkgAcquire::MethodConfig *Cfg)
+void pkgAcqIndex::StageDownloadDone(string const &Message, HashStringList const &,
+ pkgAcquire::MethodConfig const * const)
{
- // First check if the calculcated Hash of the (compressed) downloaded
- // file matches the hash we have in the MetaIndexRecords for this file
- if(VerifyHashByMetaKey(Hashes) == false)
- {
- RenameOnError(HashSumMismatch);
- Failed(Message, Cfg);
- return;
- }
-
Complete = true;
// Handle the unzipd case
@@ -1406,7 +2488,7 @@ void pkgAcqIndex::StageDownloadDone(string Message,
// Methods like e.g. "file:" will give us a (compressed) FileName that is
// not the "DestFile" we set, in this case we uncompress from the local file
- if (FileName != DestFile)
+ if (FileName != DestFile && RealFileExists(DestFile) == false)
Local = true;
else
EraseFileName = FileName;
@@ -1424,7 +2506,7 @@ void pkgAcqIndex::StageDownloadDone(string Message,
// If we have compressed indexes enabled, queue for hash verification
if (_config->FindB("Acquire::GzipIndexes",false))
{
- DestFile = GetPartialFileNameFromURI(RealURI + '.' + CurrentCompressionExtension);
+ DestFile = GetPartialFileNameFromURI(Target.URI + '.' + CurrentCompressionExtension);
EraseFileName = "";
Stage = STAGE_DECOMPRESS_AND_VERIFY;
Desc.URI = "copy:" + FileName;
@@ -1453,785 +2535,28 @@ void pkgAcqIndex::StageDownloadDone(string Message,
SetActiveSubprocess(decompProg);
}
/*}}}*/
-// pkgAcqIndex::StageDecompressDone - Final verification /*{{{*/
-void pkgAcqIndex::StageDecompressDone(string Message,
- HashStringList const &Hashes,
- pkgAcquire::MethodConfig *Cfg)
+// AcqIndex::StageDecompressDone - Final verification /*{{{*/
+void pkgAcqIndex::StageDecompressDone(string const &,
+ HashStringList const &,
+ pkgAcquire::MethodConfig const * const)
{
- if (ExpectedHashes.usable() && ExpectedHashes != Hashes)
- {
- Desc.URI = RealURI;
- RenameOnError(HashSumMismatch);
- printHashSumComparision(RealURI, ExpectedHashes, Hashes);
- Failed(Message, Cfg);
- return;
- }
-
- if(!ValidateFile(DestFile))
- {
- RenameOnError(InvalidFormat);
- Failed(Message, Cfg);
- return;
- }
-
- // remove the compressed version of the file
- unlink(EraseFileName.c_str());
-
// Done, queue for rename on transaction finished
TransactionManager->TransactionStageCopy(this, DestFile, GetFinalFilename());
-
return;
}
/*}}}*/
-// AcqMetaBase::Add - Add a item to the current Transaction /*{{{*/
-void pkgAcqMetaBase::Add(Item *I)
-{
- Transaction.push_back(I);
-}
- /*}}}*/
-// AcqMetaBase::AbortTransaction - Abort the current Transaction /*{{{*/
-void pkgAcqMetaBase::AbortTransaction()
-{
- if(_config->FindB("Debug::Acquire::Transaction", false) == true)
- std::clog << "AbortTransaction: " << TransactionManager << std::endl;
-
- // ensure the toplevel is in error state too
- for (std::vector<Item*>::iterator I = Transaction.begin();
- I != Transaction.end(); ++I)
- {
- if(_config->FindB("Debug::Acquire::Transaction", false) == true)
- std::clog << " Cancel: " << (*I)->DestFile << std::endl;
- // the transaction will abort, so stop anything that is idle
- if ((*I)->Status == pkgAcquire::Item::StatIdle)
- {
- (*I)->Status = pkgAcquire::Item::StatDone;
- (*I)->Dequeue();
- }
- }
- Transaction.clear();
-}
- /*}}}*/
-// AcqMetaBase::TransactionHasError - Check for errors in Transaction /*{{{*/
-bool pkgAcqMetaBase::TransactionHasError()
-{
- for (pkgAcquire::ItemIterator I = Transaction.begin();
- I != Transaction.end(); ++I)
- if((*I)->Status != pkgAcquire::Item::StatDone &&
- (*I)->Status != pkgAcquire::Item::StatIdle)
- return true;
-
- return false;
-}
- /*}}}*/
-// AcqMetaBase::CommitTransaction - Commit a transaction /*{{{*/
-void pkgAcqMetaBase::CommitTransaction()
-{
- if(_config->FindB("Debug::Acquire::Transaction", false) == true)
- std::clog << "CommitTransaction: " << this << std::endl;
-
- // move new files into place *and* remove files that are not
- // part of the transaction but are still on disk
- for (std::vector<Item*>::iterator I = Transaction.begin();
- I != Transaction.end(); ++I)
- {
- if((*I)->PartialFile != "")
- {
- if(_config->FindB("Debug::Acquire::Transaction", false) == true)
- std::clog << "mv " << (*I)->PartialFile << " -> "<< (*I)->DestFile << " "
- << (*I)->DescURI() << std::endl;
-
- Rename((*I)->PartialFile, (*I)->DestFile);
- } else {
- if(_config->FindB("Debug::Acquire::Transaction", false) == true)
- std::clog << "rm "
- << (*I)->DestFile
- << " "
- << (*I)->DescURI()
- << std::endl;
- unlink((*I)->DestFile.c_str());
- }
- // mark that this transaction is finished
- (*I)->TransactionManager = 0;
- }
- Transaction.clear();
-}
- /*}}}*/
-// AcqMetaBase::TransactionStageCopy - Stage a file for copying /*{{{*/
-void pkgAcqMetaBase::TransactionStageCopy(Item *I,
- const std::string &From,
- const std::string &To)
-{
- I->PartialFile = From;
- I->DestFile = To;
-}
- /*}}}*/
-// AcqMetaBase::TransactionStageRemoval - Sage a file for removal /*{{{*/
-void pkgAcqMetaBase::TransactionStageRemoval(Item *I,
- const std::string &FinalFile)
-{
- I->PartialFile = "";
- I->DestFile = FinalFile;
-}
- /*}}}*/
-// AcqMetaBase::GenerateAuthWarning - Check gpg authentication error /*{{{*/
-bool pkgAcqMetaBase::CheckStopAuthentication(const std::string &RealURI,
- const std::string &Message)
-{
- // FIXME: this entire function can do now that we disallow going to
- // a unauthenticated state and can cleanly rollback
-
- string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
-
- if(FileExists(Final))
- {
- Status = StatTransientNetworkError;
- _error->Warning(_("An error occurred during the signature "
- "verification. The repository is not updated "
- "and the previous index files will be used. "
- "GPG error: %s: %s\n"),
- Desc.Description.c_str(),
- LookupTag(Message,"Message").c_str());
- RunScripts("APT::Update::Auth-Failure");
- return true;
- } else if (LookupTag(Message,"Message").find("NODATA") != string::npos) {
- /* Invalid signature file, reject (LP: #346386) (Closes: #627642) */
- _error->Error(_("GPG error: %s: %s"),
- Desc.Description.c_str(),
- LookupTag(Message,"Message").c_str());
- Status = StatError;
- return true;
- } else {
- _error->Warning(_("GPG error: %s: %s"),
- Desc.Description.c_str(),
- LookupTag(Message,"Message").c_str());
- }
- // gpgv method failed
- ReportMirrorFailure("GPGFailure");
- return false;
-}
- /*}}}*/
-// AcqMetaSig::AcqMetaSig - Constructor /*{{{*/
-pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
- pkgAcqMetaBase *TransactionManager,
- string URI,string URIDesc,string ShortDesc,
- string MetaIndexFile,
- const vector<IndexTarget*>* IndexTargets,
- indexRecords* MetaIndexParser) :
- pkgAcqMetaBase(Owner, IndexTargets, MetaIndexParser,
- HashStringList(), TransactionManager),
- RealURI(URI), MetaIndexFile(MetaIndexFile), URIDesc(URIDesc),
- ShortDesc(ShortDesc)
-{
- DestFile = _config->FindDir("Dir::State::lists") + "partial/";
- DestFile += URItoFileName(RealURI);
-
- // 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());
-
- // set the TransactionManager
- if(_config->FindB("Debug::Acquire::Transaction", false) == true)
- std::clog << "New pkgAcqMetaSig with TransactionManager "
- << TransactionManager << std::endl;
-
- // Create the item
- Desc.Description = URIDesc;
- Desc.Owner = this;
- Desc.ShortDesc = ShortDesc;
- Desc.URI = URI;
-
- QueueURI(Desc);
-}
- /*}}}*/
-pkgAcqMetaSig::~pkgAcqMetaSig() /*{{{*/
-{
-}
- /*}}}*/
-// pkgAcqMetaSig::Custom600Headers - Insert custom request headers /*{{{*/
-// ---------------------------------------------------------------------
-string pkgAcqMetaSig::Custom600Headers() const
-{
- std::string Header = GetCustom600Headers(RealURI);
- return Header;
-}
- /*}}}*/
-// pkgAcqMetaSig::Done - The signature was downloaded/verified /*{{{*/
-// ---------------------------------------------------------------------
-/* The only header we use is the last-modified header. */
-void pkgAcqMetaSig::Done(string Message,unsigned long long Size,
- HashStringList const &Hashes,
- pkgAcquire::MethodConfig *Cfg)
-{
- Item::Done(Message, Size, Hashes, Cfg);
-
- if(AuthPass == false)
- {
- if(CheckDownloadDone(Message, RealURI) == true)
- {
- // destfile will be modified to point to MetaIndexFile for the
- // gpgv method, so we need to save it here
- MetaIndexFileSignature = DestFile;
- QueueForSignatureVerify(MetaIndexFile, MetaIndexFileSignature);
- }
- return;
- }
- else
- {
- if(CheckAuthDone(Message, RealURI) == true)
- {
- std::string FinalFile = _config->FindDir("Dir::State::lists");
- FinalFile += URItoFileName(RealURI);
- TransactionManager->TransactionStageCopy(this, MetaIndexFileSignature, FinalFile);
- }
- }
-}
- /*}}}*/
-void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)/*{{{*/
-{
- Item::Failed(Message,Cnf);
+pkgAcqIndex::~pkgAcqIndex() {}
- // check if we need to fail at this point
- if (AuthPass == true && CheckStopAuthentication(RealURI, Message))
- return;
-
- // FIXME: meh, this is not really elegant
- string const Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
- string const InReleaseURI = RealURI.replace(RealURI.rfind("Release.gpg"), 12,
- "InRelease");
- string const FinalInRelease = _config->FindDir("Dir::State::lists") + URItoFileName(InReleaseURI);
- if (RealFileExists(Final) || RealFileExists(FinalInRelease))
- {
- std::string downgrade_msg;
- strprintf(downgrade_msg, _("The repository '%s' is no longer signed."),
- URIDesc.c_str());
- if(_config->FindB("Acquire::AllowDowngradeToInsecureRepositories"))
- {
- // meh, the users wants to take risks (we still mark the packages
- // from this repository as unauthenticated)
- _error->Warning("%s", downgrade_msg.c_str());
- _error->Warning(_("This is normally not allowed, but the option "
- "Acquire::AllowDowngradeToInsecureRepositories was "
- "given to override it."));
- Status = StatDone;
- } else {
- _error->Error("%s", downgrade_msg.c_str());
- Rename(MetaIndexFile, MetaIndexFile+".FAILED");
- Item::Failed("Message: " + downgrade_msg, Cnf);
- TransactionManager->AbortTransaction();
- return;
- }
- }
- else
- _error->Warning(_("The data from '%s' is not signed. Packages "
- "from that repository can not be authenticated."),
- URIDesc.c_str());
-
- // this ensures that any file in the lists/ dir is removed by the
- // transaction
- DestFile = GetPartialFileNameFromURI(RealURI);
- TransactionManager->TransactionStageRemoval(this, DestFile);
-
- // only allow going further if the users explicitely wants it
- if(AllowInsecureRepositories(MetaIndexParser, TransactionManager, this) == true)
- {
- // we parse the indexes here because at this point the user wanted
- // a repository that may potentially harm him
- MetaIndexParser->Load(MetaIndexFile);
- QueueIndexes(true);
- }
-
- // FIXME: this is used often (e.g. in pkgAcqIndexTrans) so refactor
- if (Cnf->LocalOnly == true ||
- StringToBool(LookupTag(Message,"Transient-Failure"),false) == false)
- {
- // Ignore this
- Status = StatDone;
- }
-}
- /*}}}*/
-pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner, /*{{{*/
- pkgAcqMetaBase *TransactionManager,
- string URI,string URIDesc,string ShortDesc,
- string MetaIndexSigURI,string MetaIndexSigURIDesc, string MetaIndexSigShortDesc,
- const vector<IndexTarget*>* IndexTargets,
- indexRecords* MetaIndexParser) :
- pkgAcqMetaBase(Owner, IndexTargets, MetaIndexParser, HashStringList(),
- TransactionManager),
- RealURI(URI), URIDesc(URIDesc), ShortDesc(ShortDesc),
- MetaIndexSigURI(MetaIndexSigURI), MetaIndexSigURIDesc(MetaIndexSigURIDesc),
- MetaIndexSigShortDesc(MetaIndexSigShortDesc)
-{
- if(TransactionManager == NULL)
- {
- this->TransactionManager = this;
- this->TransactionManager->Add(this);
- }
-
- if(_config->FindB("Debug::Acquire::Transaction", false) == true)
- std::clog << "New pkgAcqMetaIndex with TransactionManager "
- << this->TransactionManager << std::endl;
-
-
- Init(URIDesc, ShortDesc);
-}
- /*}}}*/
-// pkgAcqMetaIndex::Init - Delayed constructor /*{{{*/
-void pkgAcqMetaIndex::Init(std::string URIDesc, std::string ShortDesc)
-{
- DestFile = GetPartialFileNameFromURI(RealURI);
-
- // Create the item
- Desc.Description = URIDesc;
- Desc.Owner = this;
- Desc.ShortDesc = ShortDesc;
- Desc.URI = RealURI;
-
- // we expect more item
- ExpectedAdditionalItems = IndexTargets->size();
- QueueURI(Desc);
-}
- /*}}}*/
-// pkgAcqMetaIndex::Custom600Headers - Insert custom request headers /*{{{*/
-// ---------------------------------------------------------------------
-string pkgAcqMetaIndex::Custom600Headers() const
-{
- return GetCustom600Headers(RealURI);
-}
- /*}}}*/
-void pkgAcqMetaIndex::Done(string Message,unsigned long long Size, /*{{{*/
- HashStringList const &Hashes,
- pkgAcquire::MethodConfig *Cfg)
-{
- Item::Done(Message,Size,Hashes,Cfg);
-
- if(CheckDownloadDone(Message, RealURI))
- {
- // we have a Release file, now download the Signature, all further
- // verify/queue for additional downloads will be done in the
- // pkgAcqMetaSig::Done() code
- std::string MetaIndexFile = DestFile;
- new pkgAcqMetaSig(Owner, TransactionManager,
- MetaIndexSigURI, MetaIndexSigURIDesc,
- MetaIndexSigShortDesc, MetaIndexFile, IndexTargets,
- MetaIndexParser);
-
- string FinalFile = _config->FindDir("Dir::State::lists");
- FinalFile += URItoFileName(RealURI);
- TransactionManager->TransactionStageCopy(this, DestFile, FinalFile);
- }
-}
- /*}}}*/
-bool pkgAcqMetaBase::CheckAuthDone(string Message, const string &RealURI) /*{{{*/
-{
- // At this point, the gpgv method has succeeded, so there is a
- // valid signature from a key in the trusted keyring. We
- // perform additional verification of its contents, and use them
- // to verify the indexes we are about to download
-
- if (!MetaIndexParser->Load(DestFile))
- {
- Status = StatAuthError;
- ErrorText = MetaIndexParser->ErrorText;
- return false;
- }
-
- if (!VerifyVendor(Message, RealURI))
- {
- return false;
- }
-
- if (_config->FindB("Debug::pkgAcquire::Auth", false))
- std::cerr << "Signature verification succeeded: "
- << DestFile << std::endl;
-
- // Download further indexes with verification
- //
- // it would be really nice if we could simply do
- // if (IMSHit == false) QueueIndexes(true)
- // and skip the download if the Release file has not changed
- // - but right now the list cleaner will needs to be tricked
- // to not delete all our packages/source indexes in this case
- QueueIndexes(true);
-
- return true;
-}
- /*}}}*/
-// pkgAcqMetaBase::GetCustom600Headers - Get header for AcqMetaBase /*{{{*/
-// ---------------------------------------------------------------------
-string pkgAcqMetaBase::GetCustom600Headers(const string &RealURI) const
-{
- std::string Header = "\nIndex-File: true";
- std::string MaximumSize;
- strprintf(MaximumSize, "\nMaximum-Size: %i",
- _config->FindI("Acquire::MaxReleaseFileSize", 10*1000*1000));
- Header += MaximumSize;
-
- string FinalFile = _config->FindDir("Dir::State::lists");
- FinalFile += URItoFileName(RealURI);
-
- struct stat Buf;
- if (stat(FinalFile.c_str(),&Buf) == 0)
- Header += "\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
-
- return Header;
-}
- /*}}}*/
-// pkgAcqMetaBase::QueueForSignatureVerify /*{{{*/
-void pkgAcqMetaBase::QueueForSignatureVerify(const std::string &MetaIndexFile,
- const std::string &MetaIndexFileSignature)
-{
- AuthPass = true;
- Desc.URI = "gpgv:" + MetaIndexFileSignature;
- DestFile = MetaIndexFile;
- QueueURI(Desc);
- SetActiveSubprocess("gpgv");
-}
- /*}}}*/
-// pkgAcqMetaBase::CheckDownloadDone /*{{{*/
-bool pkgAcqMetaBase::CheckDownloadDone(const std::string &Message,
- const std::string &RealURI)
-{
- // We have just finished downloading a Release file (it is not
- // verified yet)
-
- string FileName = LookupTag(Message,"Filename");
- if (FileName.empty() == true)
- {
- Status = StatError;
- ErrorText = "Method gave a blank filename";
- return false;
- }
-
- if (FileName != DestFile)
- {
- Local = true;
- Desc.URI = "copy:" + FileName;
- QueueURI(Desc);
- return false;
- }
-
- // make sure to verify against the right file on I-M-S hit
- IMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false);
- if(IMSHit)
- {
- string FinalFile = _config->FindDir("Dir::State::lists");
- FinalFile += URItoFileName(RealURI);
- DestFile = FinalFile;
- }
-
- // set Item to complete as the remaining work is all local (verify etc)
- Complete = true;
-
- return true;
-}
- /*}}}*/
-void pkgAcqMetaBase::QueueIndexes(bool verify) /*{{{*/
-{
- // at this point the real Items are loaded in the fetcher
- ExpectedAdditionalItems = 0;
-
- vector <struct IndexTarget*>::const_iterator Target;
- for (Target = IndexTargets->begin();
- Target != IndexTargets->end();
- ++Target)
- {
- HashStringList ExpectedIndexHashes;
- const indexRecords::checkSum *Record = MetaIndexParser->Lookup((*Target)->MetaKey);
-
- // optional target that we do not have in the Release file are
- // skipped
- if (verify == true && Record == NULL && (*Target)->IsOptional())
- continue;
-
- // targets without a hash record are a error when verify is required
- if (verify == true && Record == NULL)
- {
- Status = StatAuthError;
- strprintf(ErrorText, _("Unable to find expected entry '%s' in Release file (Wrong sources.list entry or malformed file)"), (*Target)->MetaKey.c_str());
- return;
- }
-
- if (Record)
- ExpectedIndexHashes = Record->Hashes;
-
- if (_config->FindB("Debug::pkgAcquire::Auth", false))
- {
- std::cerr << "Queueing: " << (*Target)->URI << std::endl
- << "Expected Hash:" << std::endl;
- for (HashStringList::const_iterator hs = ExpectedIndexHashes.begin(); hs != ExpectedIndexHashes.end(); ++hs)
- std::cerr << "\t- " << hs->toStr() << std::endl;
- std::cerr << "For: " << Record->MetaKeyFilename << std::endl;
-
- }
- if (verify == true && ExpectedIndexHashes.empty() == true)
- {
- Status = StatAuthError;
- strprintf(ErrorText, _("Unable to find hash sum for '%s' in Release file"), (*Target)->MetaKey.c_str());
- return;
- }
-
- /* Queue the Index file (Packages, Sources, Translation-$foo
- (either diff or full packages files, depending
- on the users option) - we also check if the PDiff Index file is listed
- in the Meta-Index file. Ideal would be if pkgAcqDiffIndex would test this
- instead, but passing the required info to it is to much hassle */
- if(_config->FindB("Acquire::PDiffs",true) == true && (verify == false ||
- MetaIndexParser->Exists((*Target)->MetaKey + ".diff/Index") == true))
- new pkgAcqDiffIndex(Owner, TransactionManager, *Target, ExpectedIndexHashes, MetaIndexParser);
- else
- new pkgAcqIndex(Owner, TransactionManager, *Target, ExpectedIndexHashes, MetaIndexParser);
- }
-}
- /*}}}*/
-bool pkgAcqMetaBase::VerifyVendor(string Message, const string &RealURI)/*{{{*/
-{
- string::size_type pos;
-
- // check for missing sigs (that where not fatal because otherwise we had
- // bombed earlier)
- string missingkeys;
- string msg = _("There is no public key available for the "
- "following key IDs:\n");
- pos = Message.find("NO_PUBKEY ");
- if (pos != std::string::npos)
- {
- string::size_type start = pos+strlen("NO_PUBKEY ");
- string Fingerprint = Message.substr(start, Message.find("\n")-start);
- missingkeys += (Fingerprint);
- }
- if(!missingkeys.empty())
- _error->Warning("%s", (msg + missingkeys).c_str());
-
- string Transformed = MetaIndexParser->GetExpectedDist();
-
- if (Transformed == "../project/experimental")
- {
- Transformed = "experimental";
- }
-
- pos = Transformed.rfind('/');
- if (pos != string::npos)
- {
- Transformed = Transformed.substr(0, pos);
- }
-
- if (Transformed == ".")
- {
- Transformed = "";
- }
-
- if (_config->FindB("Acquire::Check-Valid-Until", true) == true &&
- MetaIndexParser->GetValidUntil() > 0) {
- time_t const invalid_since = time(NULL) - MetaIndexParser->GetValidUntil();
- if (invalid_since > 0)
- // TRANSLATOR: The first %s is the URL of the bad Release file, the second is
- // the time since then the file is invalid - formated in the same way as in
- // the download progress display (e.g. 7d 3h 42min 1s)
- return _error->Error(
- _("Release file for %s is expired (invalid since %s). "
- "Updates for this repository will not be applied."),
- RealURI.c_str(), TimeToStr(invalid_since).c_str());
- }
-
- if (_config->FindB("Debug::pkgAcquire::Auth", false))
- {
- std::cerr << "Got Codename: " << MetaIndexParser->GetDist() << std::endl;
- std::cerr << "Expecting Dist: " << MetaIndexParser->GetExpectedDist() << std::endl;
- std::cerr << "Transformed Dist: " << Transformed << std::endl;
- }
-
- if (MetaIndexParser->CheckDist(Transformed) == false)
- {
- // This might become fatal one day
-// Status = StatAuthError;
-// ErrorText = "Conflicting distribution; expected "
-// + MetaIndexParser->GetExpectedDist() + " but got "
-// + MetaIndexParser->GetDist();
-// return false;
- if (!Transformed.empty())
- {
- _error->Warning(_("Conflicting distribution: %s (expected %s but got %s)"),
- Desc.Description.c_str(),
- Transformed.c_str(),
- MetaIndexParser->GetDist().c_str());
- }
- }
-
- return true;
-}
- /*}}}*/
-// pkgAcqMetaIndex::Failed - no Release file present /*{{{*/
-void pkgAcqMetaIndex::Failed(string Message,
- pkgAcquire::MethodConfig * Cnf)
-{
- pkgAcquire::Item::Failed(Message, Cnf);
- Status = StatDone;
-
- string FinalFile = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
-
- _error->Warning(_("The repository '%s' does not have a Release file. "
- "This is deprecated, please contact the owner of the "
- "repository."), URIDesc.c_str());
-
- // No Release file was present so fall
- // back to queueing Packages files without verification
- // only allow going further if the users explicitely wants it
- if(AllowInsecureRepositories(MetaIndexParser, TransactionManager, this) == true)
- {
- // Done, queue for rename on transaction finished
- if (FileExists(DestFile))
- TransactionManager->TransactionStageCopy(this, DestFile, FinalFile);
-
- // queue without any kind of hashsum support
- QueueIndexes(false);
- }
-}
- /*}}}*/
-void pkgAcqMetaIndex::Finished() /*{{{*/
-{
- if(_config->FindB("Debug::Acquire::Transaction", false) == true)
- std::clog << "Finished: " << DestFile <<std::endl;
- if(TransactionManager != NULL &&
- TransactionManager->TransactionHasError() == false)
- TransactionManager->CommitTransaction();
-}
- /*}}}*/
-pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire *Owner, /*{{{*/
- string const &URI, string const &URIDesc, string const &ShortDesc,
- string const &MetaIndexURI, string const &MetaIndexURIDesc, string const &MetaIndexShortDesc,
- string const &MetaSigURI, string const &MetaSigURIDesc, string const &MetaSigShortDesc,
- const vector<IndexTarget*>* IndexTargets,
- indexRecords* MetaIndexParser) :
- pkgAcqMetaIndex(Owner, NULL, URI, URIDesc, ShortDesc, MetaSigURI, MetaSigURIDesc,MetaSigShortDesc, IndexTargets, MetaIndexParser),
- MetaIndexURI(MetaIndexURI), MetaIndexURIDesc(MetaIndexURIDesc), MetaIndexShortDesc(MetaIndexShortDesc),
- MetaSigURI(MetaSigURI), MetaSigURIDesc(MetaSigURIDesc), MetaSigShortDesc(MetaSigShortDesc)
-{
- // index targets + (worst case:) Release/Release.gpg
- ExpectedAdditionalItems = IndexTargets->size() + 2;
-
-}
- /*}}}*/
-pkgAcqMetaClearSig::~pkgAcqMetaClearSig() /*{{{*/
-{
-}
- /*}}}*/
-// pkgAcqMetaClearSig::Custom600Headers - Insert custom request headers /*{{{*/
-// ---------------------------------------------------------------------
-string pkgAcqMetaClearSig::Custom600Headers() const
-{
- string Header = GetCustom600Headers(RealURI);
- Header += "\nFail-Ignore: true";
- return Header;
-}
- /*}}}*/
-// pkgAcqMetaClearSig::Done - We got a file /*{{{*/
-// ---------------------------------------------------------------------
-void pkgAcqMetaClearSig::Done(std::string Message,unsigned long long Size,
- HashStringList const &Hashes,
- pkgAcquire::MethodConfig *Cnf)
-{
- Item::Done(Message, Size, Hashes, Cnf);
-
- // if we expect a ClearTextSignature (InRelase), ensure that
- // this is what we get and if not fail to queue a
- // Release/Release.gpg, see #346386
- if (FileExists(DestFile) && !StartsWithGPGClearTextSignature(DestFile))
- {
- pkgAcquire::Item::Failed(Message, Cnf);
- RenameOnError(NotClearsigned);
- TransactionManager->AbortTransaction();
- return;
- }
-
- if(AuthPass == false)
- {
- if(CheckDownloadDone(Message, RealURI) == true)
- QueueForSignatureVerify(DestFile, DestFile);
- return;
- }
- else
- {
- if(CheckAuthDone(Message, RealURI) == true)
- {
- string FinalFile = _config->FindDir("Dir::State::lists");
- FinalFile += URItoFileName(RealURI);
-
- // queue for copy in place
- TransactionManager->TransactionStageCopy(this, DestFile, FinalFile);
- }
- }
-}
- /*}}}*/
-void pkgAcqMetaClearSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{*/
-{
- Item::Failed(Message, Cnf);
-
- // we failed, we will not get additional items from this method
- ExpectedAdditionalItems = 0;
-
- if (AuthPass == false)
- {
- // Queue the 'old' InRelease file for removal if we try Release.gpg
- // as otherwise the file will stay around and gives a false-auth
- // impression (CVE-2012-0214)
- string FinalFile = _config->FindDir("Dir::State::lists");
- FinalFile.append(URItoFileName(RealURI));
- TransactionManager->TransactionStageRemoval(this, FinalFile);
- Status = StatDone;
-
- new pkgAcqMetaIndex(Owner, TransactionManager,
- MetaIndexURI, MetaIndexURIDesc, MetaIndexShortDesc,
- MetaSigURI, MetaSigURIDesc, MetaSigShortDesc,
- IndexTargets, MetaIndexParser);
- }
- else
- {
- if(CheckStopAuthentication(RealURI, Message))
- return;
-
- _error->Warning(_("The data from '%s' is not signed. Packages "
- "from that repository can not be authenticated."),
- URIDesc.c_str());
-
- // No Release file was present, or verification failed, so fall
- // back to queueing Packages files without verification
- // only allow going further if the users explicitely wants it
- if(AllowInsecureRepositories(MetaIndexParser, TransactionManager, this) == true)
- {
- Status = StatDone;
-
- /* Always move the meta index, even if gpgv failed. This ensures
- * that PackageFile objects are correctly filled in */
- if (FileExists(DestFile))
- {
- string FinalFile = _config->FindDir("Dir::State::lists");
- FinalFile += URItoFileName(RealURI);
- /* InRelease files become Release files, otherwise
- * they would be considered as trusted later on */
- RealURI = RealURI.replace(RealURI.rfind("InRelease"), 9,
- "Release");
- FinalFile = FinalFile.replace(FinalFile.rfind("InRelease"), 9,
- "Release");
-
- // Done, queue for rename on transaction finished
- TransactionManager->TransactionStageCopy(this, DestFile, FinalFile);
- }
- QueueIndexes(false);
- }
- }
-}
- /*}}}*/
// AcqArchive::AcqArchive - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* This just sets up the initial fetch environment and queues the first
possibilitiy */
-pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources,
- pkgRecords *Recs,pkgCache::VerIterator const &Version,
+pkgAcqArchive::pkgAcqArchive(pkgAcquire * const Owner,pkgSourceList * const Sources,
+ pkgRecords * const Recs,pkgCache::VerIterator const &Version,
string &StoreFilename) :
- Item(Owner, HashStringList()), Version(Version), Sources(Sources), Recs(Recs),
- StoreFilename(StoreFilename), Vf(Version.FileList()),
+ Item(Owner), LocalSource(false), Version(Version), Sources(Sources), Recs(Recs),
+ StoreFilename(StoreFilename), Vf(Version.FileList()),
Trusted(false)
{
Retries = _config->FindI("Acquire::Retries",0);
@@ -2251,7 +2576,7 @@ pkgAcqArchive::pkgAcqArchive(pkgAcquire *Owner,pkgSourceList *Sources,
// Skip not source sources, they do not have file fields.
for (; Vf.end() == false; ++Vf)
{
- if ((Vf.File()->Flags & pkgCache::Flag::NotSource) != 0)
+ if (Vf.File().Flagged(pkgCache::Flag::NotSource))
continue;
break;
}
@@ -2317,15 +2642,17 @@ bool pkgAcqArchive::QueueNext()
{
for (; Vf.end() == false; ++Vf)
{
+ pkgCache::PkgFileIterator const PkgF = Vf.File();
// Ignore not source sources
- if ((Vf.File()->Flags & pkgCache::Flag::NotSource) != 0)
+ if (PkgF.Flagged(pkgCache::Flag::NotSource))
continue;
// Try to cross match against the source list
pkgIndexFile *Index;
- if (Sources->FindIndex(Vf.File(),Index) == false)
+ if (Sources->FindIndex(PkgF, Index) == false)
continue;
-
+ LocalSource = PkgF.Flagged(pkgCache::Flag::LocalSource);
+
// only try to get a trusted package from another source if that source
// is also trusted
if(Trusted && !Index->IsTrusted())
@@ -2425,25 +2752,10 @@ bool pkgAcqArchive::QueueNext()
// AcqArchive::Done - Finished fetching /*{{{*/
// ---------------------------------------------------------------------
/* */
-void pkgAcqArchive::Done(string Message,unsigned long long Size, HashStringList const &CalcHashes,
- pkgAcquire::MethodConfig *Cfg)
+void pkgAcqArchive::Done(string const &Message, HashStringList const &Hashes,
+ pkgAcquire::MethodConfig const * const Cfg)
{
- Item::Done(Message, Size, CalcHashes, Cfg);
-
- // Check the size
- if (Size != Version->Size)
- {
- RenameOnError(SizeMismatch);
- return;
- }
-
- // FIXME: could this empty() check impose *any* sort of security issue?
- if(ExpectedHashes.usable() && ExpectedHashes != CalcHashes)
- {
- RenameOnError(HashSumMismatch);
- printHashSumComparision(DestFile, ExpectedHashes, CalcHashes);
- return;
- }
+ Item::Done(Message, Hashes, Cfg);
// Grab the output filename
string FileName = LookupTag(Message,"Filename");
@@ -2455,7 +2767,7 @@ void pkgAcqArchive::Done(string Message,unsigned long long Size, HashStringList
}
// Reference filename
- if (FileName != DestFile)
+ if (DestFile != FileName && RealFileExists(DestFile) == false)
{
StoreFilename = DestFile = FileName;
Local = true;
@@ -2464,8 +2776,7 @@ void pkgAcqArchive::Done(string Message,unsigned long long Size, HashStringList
}
// Done, move it into position
- string FinalFile = _config->FindDir("Dir::Cache::Archives");
- FinalFile += flNotDir(StoreFilename);
+ string const FinalFile = GetFinalFilename();
Rename(DestFile,FinalFile);
StoreFilename = DestFile = FinalFile;
Complete = true;
@@ -2474,14 +2785,14 @@ void pkgAcqArchive::Done(string Message,unsigned long long Size, HashStringList
// AcqArchive::Failed - Failure handler /*{{{*/
// ---------------------------------------------------------------------
/* Here we try other sources */
-void pkgAcqArchive::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
+void pkgAcqArchive::Failed(string const &Message,pkgAcquire::MethodConfig const * const Cnf)
{
Item::Failed(Message,Cnf);
- /* We don't really want to retry on failed media swaps, this prevents
+ /* We don't really want to retry on failed media swaps, this prevents
that. An interesting observation is that permanent failures are not
recorded. */
- if (Cnf->Removable == true &&
+ if (Cnf->Removable == true &&
StringToBool(LookupTag(Message,"Transient-Failure"),false) == true)
{
// Vf = Version.FileList();
@@ -2509,17 +2820,12 @@ void pkgAcqArchive::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
}
}
/*}}}*/
-// AcqArchive::IsTrusted - Determine whether this archive comes from a trusted source /*{{{*/
-// ---------------------------------------------------------------------
-APT_PURE bool pkgAcqArchive::IsTrusted() const
+APT_PURE bool pkgAcqArchive::IsTrusted() const /*{{{*/
{
return Trusted;
}
/*}}}*/
-// AcqArchive::Finished - Fetching has finished, tidy up /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void pkgAcqArchive::Finished()
+void pkgAcqArchive::Finished() /*{{{*/
{
if (Status == pkgAcquire::Item::StatDone &&
Complete == true)
@@ -2527,17 +2833,225 @@ void pkgAcqArchive::Finished()
StoreFilename = string();
}
/*}}}*/
+std::string pkgAcqArchive::DescURI() const /*{{{*/
+{
+ return Desc.URI;
+}
+ /*}}}*/
+std::string pkgAcqArchive::ShortDesc() const /*{{{*/
+{
+ return Desc.ShortDesc;
+}
+ /*}}}*/
+pkgAcqArchive::~pkgAcqArchive() {}
+
+// AcqChangelog::pkgAcqChangelog - Constructors /*{{{*/
+pkgAcqChangelog::pkgAcqChangelog(pkgAcquire * const Owner, pkgCache::VerIterator const &Ver,
+ std::string const &DestDir, std::string const &DestFilename) :
+ pkgAcquire::Item(Owner), d(NULL), SrcName(Ver.SourcePkgName()), SrcVersion(Ver.SourceVerStr())
+{
+ Desc.URI = URI(Ver);
+ Init(DestDir, DestFilename);
+}
+// some parameters are char* here as they come likely from char* interfaces – which can also return NULL
+pkgAcqChangelog::pkgAcqChangelog(pkgAcquire * const Owner, pkgCache::RlsFileIterator const &RlsFile,
+ char const * const Component, char const * const SrcName, char const * const SrcVersion,
+ const string &DestDir, const string &DestFilename) :
+ pkgAcquire::Item(Owner), d(NULL), SrcName(SrcName), SrcVersion(SrcVersion)
+{
+ Desc.URI = URI(RlsFile, Component, SrcName, SrcVersion);
+ Init(DestDir, DestFilename);
+}
+pkgAcqChangelog::pkgAcqChangelog(pkgAcquire * const Owner,
+ std::string const &URI, char const * const SrcName, char const * const SrcVersion,
+ const string &DestDir, const string &DestFilename) :
+ pkgAcquire::Item(Owner), d(NULL), SrcName(SrcName), SrcVersion(SrcVersion)
+{
+ Desc.URI = URI;
+ Init(DestDir, DestFilename);
+}
+void pkgAcqChangelog::Init(std::string const &DestDir, std::string const &DestFilename)
+{
+ if (Desc.URI.empty())
+ {
+ Status = StatError;
+ // TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
+ strprintf(ErrorText, _("Changelog unavailable for %s=%s"), SrcName.c_str(), SrcVersion.c_str());
+ // Let the error message print something sensible rather than "Failed to fetch /"
+ if (DestFilename.empty())
+ DestFile = SrcName + ".changelog";
+ else
+ DestFile = DestFilename;
+ Desc.URI = "changelog:/" + DestFile;
+ return;
+ }
+
+ if (DestDir.empty())
+ {
+ std::string const systemTemp = GetTempDir();
+ char tmpname[100];
+ snprintf(tmpname, sizeof(tmpname), "%s/apt-changelog-XXXXXX", systemTemp.c_str());
+ if (NULL == mkdtemp(tmpname))
+ {
+ _error->Errno("mkdtemp", "mkdtemp failed in changelog acquire of %s %s", SrcName.c_str(), SrcVersion.c_str());
+ Status = StatError;
+ return;
+ }
+ DestFile = TemporaryDirectory = tmpname;
+ }
+ else
+ DestFile = DestDir;
+
+ if (DestFilename.empty())
+ DestFile = flCombine(DestFile, SrcName + ".changelog");
+ else
+ DestFile = flCombine(DestFile, DestFilename);
+
+ Desc.ShortDesc = "Changelog";
+ strprintf(Desc.Description, "%s %s %s Changelog", URI::SiteOnly(Desc.URI).c_str(), SrcName.c_str(), SrcVersion.c_str());
+ Desc.Owner = this;
+ QueueURI(Desc);
+}
+ /*}}}*/
+std::string pkgAcqChangelog::URI(pkgCache::VerIterator const &Ver) /*{{{*/
+{
+ char const * const SrcName = Ver.SourcePkgName();
+ char const * const SrcVersion = Ver.SourceVerStr();
+ pkgCache::PkgFileIterator PkgFile;
+ // find the first source for this version which promises a changelog
+ for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; ++VF)
+ {
+ pkgCache::PkgFileIterator const PF = VF.File();
+ if (PF.Flagged(pkgCache::Flag::NotSource) || PF->Release == 0)
+ continue;
+ PkgFile = PF;
+ pkgCache::RlsFileIterator const RF = PF.ReleaseFile();
+ std::string const uri = URI(RF, PF.Component(), SrcName, SrcVersion);
+ if (uri.empty())
+ continue;
+ return uri;
+ }
+ return "";
+}
+std::string pkgAcqChangelog::URITemplate(pkgCache::RlsFileIterator const &Rls)
+{
+ if (Rls.end() == true || (Rls->Label == 0 && Rls->Origin == 0))
+ return "";
+ std::string const serverConfig = "Acquire::Changelogs::URI";
+ std::string server;
+#define APT_EMPTY_SERVER \
+ if (server.empty() == false) \
+ { \
+ if (server != "no") \
+ return server; \
+ return ""; \
+ }
+#define APT_CHECK_SERVER(X, Y) \
+ if (Rls->X != 0) \
+ { \
+ std::string const specialServerConfig = serverConfig + "::" + Y + #X + "::" + Rls.X(); \
+ server = _config->Find(specialServerConfig); \
+ APT_EMPTY_SERVER \
+ }
+ // this way e.g. Debian-Security can fallback to Debian
+ APT_CHECK_SERVER(Label, "Override::")
+ APT_CHECK_SERVER(Origin, "Override::")
+
+ if (RealFileExists(Rls.FileName()))
+ {
+ _error->PushToStack();
+ FileFd rf;
+ /* This can be costly. A caller wanting to get millions of URIs might
+ want to do this on its own once and use Override settings.
+ We don't do this here as Origin/Label are not as unique as they
+ should be so this could produce request order-dependent anomalies */
+ if (OpenMaybeClearSignedFile(Rls.FileName(), rf) == true)
+ {
+ pkgTagFile TagFile(&rf, rf.Size());
+ pkgTagSection Section;
+ if (TagFile.Step(Section) == true)
+ server = Section.FindS("Changelogs");
+ }
+ _error->RevertToStack();
+ APT_EMPTY_SERVER
+ }
+
+ APT_CHECK_SERVER(Label, "")
+ APT_CHECK_SERVER(Origin, "")
+#undef APT_CHECK_SERVER
+#undef APT_EMPTY_SERVER
+ return "";
+}
+std::string pkgAcqChangelog::URI(pkgCache::RlsFileIterator const &Rls,
+ char const * const Component, char const * const SrcName,
+ char const * const SrcVersion)
+{
+ return URI(URITemplate(Rls), Component, SrcName, SrcVersion);
+}
+std::string pkgAcqChangelog::URI(std::string const &Template,
+ char const * const Component, char const * const SrcName,
+ char const * const SrcVersion)
+{
+ if (Template.find("CHANGEPATH") == std::string::npos)
+ return "";
+
+ // the path is: COMPONENT/SRC/SRCNAME/SRCNAME_SRCVER, e.g. main/a/apt/1.1 or contrib/liba/libapt/2.0
+ std::string Src = SrcName;
+ std::string path = APT::String::Startswith(SrcName, "lib") ? Src.substr(0, 4) : Src.substr(0,1);
+ path.append("/").append(Src).append("/");
+ path.append(Src).append("_").append(StripEpoch(SrcVersion));
+ // we omit component for releases without one (= flat-style repositories)
+ if (Component != NULL && strlen(Component) != 0)
+ path = std::string(Component) + "/" + path;
+
+ return SubstVar(Template, "CHANGEPATH", path);
+}
+ /*}}}*/
+// AcqChangelog::Failed - Failure handler /*{{{*/
+void pkgAcqChangelog::Failed(string const &Message, pkgAcquire::MethodConfig const * const Cnf)
+{
+ Item::Failed(Message,Cnf);
+
+ std::string errText;
+ // TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
+ strprintf(errText, _("Changelog unavailable for %s=%s"), SrcName.c_str(), SrcVersion.c_str());
+
+ // Error is probably something techy like 404 Not Found
+ if (ErrorText.empty())
+ ErrorText = errText;
+ else
+ ErrorText = errText + " (" + ErrorText + ")";
+ return;
+}
+ /*}}}*/
+// AcqChangelog::Done - Item downloaded OK /*{{{*/
+void pkgAcqChangelog::Done(string const &Message,HashStringList const &CalcHashes,
+ pkgAcquire::MethodConfig const * const Cnf)
+{
+ Item::Done(Message,CalcHashes,Cnf);
+
+ Complete = true;
+}
+ /*}}}*/
+pkgAcqChangelog::~pkgAcqChangelog() /*{{{*/
+{
+ if (TemporaryDirectory.empty() == false)
+ {
+ unlink(DestFile.c_str());
+ rmdir(TemporaryDirectory.c_str());
+ }
+}
+ /*}}}*/
+
// AcqFile::pkgAcqFile - Constructor /*{{{*/
-// ---------------------------------------------------------------------
-/* The file is added to the queue */
-pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI, HashStringList const &Hashes,
- unsigned long long Size,string Dsc,string ShortDesc,
+pkgAcqFile::pkgAcqFile(pkgAcquire * const Owner,string const &URI, HashStringList const &Hashes,
+ unsigned long long const Size,string const &Dsc,string const &ShortDesc,
const string &DestDir, const string &DestFilename,
- bool IsIndexFile) :
- Item(Owner, Hashes), IsIndexFile(IsIndexFile)
+ bool const IsIndexFile) :
+ Item(Owner), IsIndexFile(IsIndexFile), ExpectedHashes(Hashes)
{
Retries = _config->FindI("Acquire::Retries",0);
-
+
if(!DestFilename.empty())
DestFile = DestFilename;
else if(!DestDir.empty())
@@ -2552,7 +3066,7 @@ pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI, HashStringList const &Hashe
// Set the short description to the archive component
Desc.ShortDesc = ShortDesc;
-
+
// Get the transfer sizes
FileSize = Size;
struct stat Buf;
@@ -2569,21 +3083,11 @@ pkgAcqFile::pkgAcqFile(pkgAcquire *Owner,string URI, HashStringList const &Hashe
}
/*}}}*/
// AcqFile::Done - Item downloaded OK /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void pkgAcqFile::Done(string Message,unsigned long long Size,HashStringList const &CalcHashes,
- pkgAcquire::MethodConfig *Cnf)
+void pkgAcqFile::Done(string const &Message,HashStringList const &CalcHashes,
+ pkgAcquire::MethodConfig const * const Cnf)
{
- Item::Done(Message,Size,CalcHashes,Cnf);
+ Item::Done(Message,CalcHashes,Cnf);
- // Check the hash
- if(ExpectedHashes.usable() && ExpectedHashes != CalcHashes)
- {
- RenameOnError(HashSumMismatch);
- printHashSumComparision(DestFile, ExpectedHashes, CalcHashes);
- return;
- }
-
string FileName = LookupTag(Message,"Filename");
if (FileName.empty() == true)
{
@@ -2593,13 +3097,13 @@ void pkgAcqFile::Done(string Message,unsigned long long Size,HashStringList cons
}
Complete = true;
-
+
// The files timestamp matches
if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true)
return;
-
+
// We have to copy it into place
- if (FileName != DestFile)
+ if (RealFileExists(DestFile.c_str()) == false)
{
Local = true;
if (_config->FindB("Acquire::Source-Symlinks",true) == false ||
@@ -2609,7 +3113,7 @@ void pkgAcqFile::Done(string Message,unsigned long long Size,HashStringList cons
QueueURI(Desc);
return;
}
-
+
// Erase the file if it is a symlink so we can overwrite it
struct stat St;
if (lstat(DestFile.c_str(),&St) == 0)
@@ -2617,7 +3121,7 @@ void pkgAcqFile::Done(string Message,unsigned long long Size,HashStringList cons
if (S_ISLNK(St.st_mode) != 0)
unlink(DestFile.c_str());
}
-
+
// Symlink the file
if (symlink(FileName.c_str(),DestFile.c_str()) != 0)
{
@@ -2629,14 +3133,14 @@ void pkgAcqFile::Done(string Message,unsigned long long Size,HashStringList cons
ErrorText = msg.str();
Status = StatError;
Complete = false;
- }
+ }
}
}
/*}}}*/
// AcqFile::Failed - Failure handler /*{{{*/
// ---------------------------------------------------------------------
/* Here we try other sources */
-void pkgAcqFile::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
+void pkgAcqFile::Failed(string const &Message, pkgAcquire::MethodConfig const * const Cnf)
{
Item::Failed(Message,Cnf);
@@ -2653,13 +3157,11 @@ void pkgAcqFile::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
}
/*}}}*/
-// AcqIndex::Custom600Headers - Insert custom request headers /*{{{*/
-// ---------------------------------------------------------------------
-/* The only header we use is the last-modified header. */
-string pkgAcqFile::Custom600Headers() const
+string pkgAcqFile::Custom600Headers() const /*{{{*/
{
if (IsIndexFile)
return "\nIndex-File: true";
return "";
}
/*}}}*/
+pkgAcqFile::~pkgAcqFile() {}
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 10d7e6a09..df1380b5e 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -1,26 +1,26 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: acquire-item.h,v 1.26.2.3 2004/01/02 18:51:00 mdz Exp $
/* ######################################################################
Acquire Item - Item to acquire
When an item is instantiated it will add it self to the local list in
- the Owner Acquire class. Derived classes will then call QueueURI to
- register all the URI's they wish to fetch at the initial moment.
-
+ the Owner Acquire class. Derived classes will then call QueueURI to
+ register all the URI's they wish to fetch at the initial moment.
+
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 Hash
checking and source location as well as a retry algorithm.
-
+
##################################################################### */
/*}}}*/
#ifndef PKGLIB_ACQUIRE_ITEM_H
#define PKGLIB_ACQUIRE_ITEM_H
#include <apt-pkg/acquire.h>
+#include <apt-pkg/indexfile.h>
#include <apt-pkg/hashes.h>
#include <apt-pkg/weakptr.h>
#include <apt-pkg/pkgcache.h>
@@ -28,9 +28,9 @@
#include <string>
#include <vector>
+#include <map>
#ifndef APT_8_CLEANER_HEADERS
-#include <apt-pkg/indexfile.h>
#include <apt-pkg/vendor.h>
#include <apt-pkg/sourcelist.h>
#include <apt-pkg/pkgrecords.h>
@@ -46,10 +46,10 @@
class indexRecords;
class pkgRecords;
class pkgSourceList;
-class IndexTarget;
class pkgAcqMetaBase;
-/** \brief Represents the process by which a pkgAcquire object should {{{
+class pkgAcquire::Item : public WeakPointable /*{{{*/
+/** \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
@@ -61,38 +61,7 @@ class pkgAcqMetaBase;
*
* \see pkgAcquire
*/
-class pkgAcquire::Item : public WeakPointable
-{
- friend class pkgAcqMetaBase;
-
- void *d;
-
- protected:
-
- /** \brief The acquire object with which this item is associated. */
- pkgAcquire *Owner;
-
- /** \brief Insert this item into its owner's queue.
- *
- * \param Item Metadata about this item (its URI and
- * description).
- */
- void QueueURI(ItemDesc &Item);
-
- /** \brief Remove this item from its owner's queue. */
- void Dequeue();
-
- /** \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 \a From. If \a To exists it will be
- * overwritten.
- */
- bool Rename(std::string From,std::string To);
-
+{
public:
/** \brief The current status of this item. */
@@ -117,7 +86,7 @@ class pkgAcquire::Item : public WeakPointable
*/
StatAuthError,
- /** \brief The item was could not be downloaded because of
+ /** \brief The item was could not be downloaded because of
* a transient network error (e.g. network down)
*/
StatTransientNetworkError,
@@ -145,11 +114,11 @@ class pkgAcquire::Item : public WeakPointable
std::string ActiveSubprocess;
/** \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
+ * APT progress reporting will store an ID there as shown in "Get:42 …"
*/
unsigned long ID;
@@ -165,6 +134,7 @@ class pkgAcquire::Item : public WeakPointable
* download progress indicator's overall statistics.
*/
bool Local;
+
std::string UsedMirror;
/** \brief The number of fetch queues into which this item has been
@@ -177,9 +147,6 @@ class pkgAcquire::Item : public WeakPointable
*/
unsigned int QueueCounter;
- /** \brief TransactionManager */
- pkgAcqMetaBase *TransactionManager;
-
/** \brief The number of additional fetch items that are expected
* once this item is done.
*
@@ -189,15 +156,12 @@ class pkgAcquire::Item : public WeakPointable
* progress.
*/
unsigned int ExpectedAdditionalItems;
-
+
/** \brief The name of the file into which the retrieved object
* will be written.
*/
std::string DestFile;
- /** \brief storge name until a transaction is finished */
- std::string PartialFile;
-
/** \brief Invoked by the acquire worker when the object couldn't
* be fetched.
*
@@ -211,7 +175,7 @@ class pkgAcquire::Item : public WeakPointable
*
* \sa pkgAcqMethod
*/
- virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+ virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf);
/** \brief Invoked by the acquire worker when the object was
* fetched successfully.
@@ -226,25 +190,24 @@ class pkgAcquire::Item : public WeakPointable
*
* \param Message Data from the acquire method. Use LookupTag()
* to parse it.
- * \param Size The size of the object that was fetched.
* \param Hashes The HashSums of the object that was fetched.
* \param Cnf The method via which the object was fetched.
*
* \sa pkgAcqMethod
*/
- virtual void Done(std::string Message, unsigned long long Size, HashStringList const &Hashes,
- pkgAcquire::MethodConfig *Cnf);
+ virtual void Done(std::string const &Message, HashStringList const &Hashes,
+ pkgAcquire::MethodConfig const * const 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.
+ * \param Hashes The expected hashes of the object being fetched.
*
* \sa pkgAcqMethod
*/
- virtual void Start(std::string Message,unsigned long long Size);
+ virtual void Start(std::string const &Message, unsigned long long const Size);
/** \brief Custom headers to be sent to the fetch process.
*
@@ -254,50 +217,56 @@ class pkgAcquire::Item : public WeakPointable
* line, so they should (if nonempty) have a leading newline and
* no trailing newline.
*/
- virtual std::string Custom600Headers() const {return std::string();};
+ virtual std::string Custom600Headers() const;
/** \brief A "descriptive" URI-like string.
*
* \return a URI that should be used to describe what is being fetched.
*/
- virtual std::string DescURI() = 0;
+ virtual std::string DescURI() const = 0;
/** \brief Short item description.
*
* \return a brief description of the object being fetched.
*/
- virtual std::string ShortDesc() {return DescURI();}
+ virtual std::string ShortDesc() const;
/** \brief Invoked by the worker when the download is completely done. */
- virtual void Finished() {};
-
- /** \brief HashSums
+ virtual void Finished();
+
+ /** \return HashSums the DestFile is supposed to have in this stage */
+ virtual HashStringList GetExpectedHashes() const = 0;
+ /** \return the 'best' hash for display proposes like --print-uris */
+ std::string HashSum() const;
+
+ /** \return if having no hashes is a hard failure or not
*
- * \return the HashSums of this object, if applicable; otherwise, an
- * empty list.
+ * Idealy this is always \b true for every subclass, but thanks to
+ * historical grow we don't have hashes for all files in all cases
+ * in all steps, so it is slightly more complicated than it should be.
*/
- HashStringList HashSums() const {return ExpectedHashes;};
- std::string HashSum() const {HashStringList const hashes = HashSums(); HashString const * const hs = hashes.find(NULL); return hs != NULL ? hs->toStr() : ""; };
+ virtual bool HashesRequired() const { return true; }
/** \return the acquire process with which this item is associated. */
- pkgAcquire *GetOwner() const {return Owner;};
+ pkgAcquire *GetOwner() const;
+ pkgAcquire::ItemDesc &GetItemDesc();
/** \return \b true if this object is being fetched from a trusted source. */
- virtual bool IsTrusted() const {return false;};
-
+ virtual bool IsTrusted() const;
+
/** \brief Report mirror problem
- *
+ *
* This allows reporting mirror failures back to a centralized
* server. The apt-report-mirror-failure script is called for this
- *
+ *
* \param FailCode A short failure string that is send
*/
- void ReportMirrorFailure(std::string FailCode);
+ void ReportMirrorFailure(std::string const &FailCode);
/** \brief Set the name of the current active subprocess
*
* See also #ActiveSubprocess
*/
- void SetActiveSubprocess(const std::string &subprocess);
+ void SetActiveSubprocess(std::string const &subprocess);
/** \brief Initialize an item.
*
@@ -306,11 +275,8 @@ class pkgAcquire::Item : public WeakPointable
* manually invoke QueueURI() to do so).
*
* \param Owner The new owner of this item.
- * \param ExpectedHashes of the file represented by this item
*/
- Item(pkgAcquire *Owner,
- HashStringList const &ExpectedHashes=HashStringList(),
- pkgAcqMetaBase *TransactionManager=NULL);
+ Item(pkgAcquire * const Owner);
/** \brief Remove this item from its owner's queue by invoking
* pkgAcquire::Remove.
@@ -318,6 +284,11 @@ class pkgAcquire::Item : public WeakPointable
virtual ~Item();
protected:
+ /** \brief The acquire object with which this item is associated. */
+ pkgAcquire * const Owner;
+
+ /** \brief The item that is currently being downloaded. */
+ pkgAcquire::ItemDesc Desc;
enum RenameOnErrorState {
HashSumMismatch,
@@ -325,7 +296,8 @@ class pkgAcquire::Item : public WeakPointable
InvalidFormat,
SignatureError,
NotClearsigned,
- MaximumSizeExceeded
+ MaximumSizeExceeded,
+ PDiffError,
};
/** \brief Rename failed file and set error
@@ -334,55 +306,98 @@ class pkgAcquire::Item : public WeakPointable
*/
bool RenameOnError(RenameOnErrorState const state);
- /** \brief The HashSums of the item is supposed to have than done */
- HashStringList ExpectedHashes;
+ /** \brief Insert this item into its owner's queue.
+ *
+ * The method is designed to check if the request would end
+ * in an IMSHit and if it determines that it would, it isn't
+ * queueing the Item and instead sets it to completion instantly.
+ *
+ * \param Item Metadata about this item (its URI and
+ * description).
+ * \return true if the item was inserted, false if IMSHit was detected
+ */
+ virtual bool QueueURI(ItemDesc &Item);
- /** \brief The item that is currently being downloaded. */
- pkgAcquire::ItemDesc Desc;
+ /** \brief Remove this item from its owner's queue. */
+ void Dequeue();
+
+ /** \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 \a From. If \a To exists it will be
+ * overwritten. If \a From and \a To are equal nothing happens.
+ */
+ bool Rename(std::string const &From, std::string const &To);
+
+ /** \brief Get the full pathname of the final file for the current URI */
+ virtual std::string GetFinalFilename() const;
+
+ private:
+ void *d;
+
+ friend class pkgAcqMetaBase;
};
/*}}}*/
-/** \brief Information about an index patch (aka diff). */ /*{{{*/
-struct DiffInfo {
- /** The filename of the diff. */
- std::string file;
+class APT_HIDDEN pkgAcqTransactionItem: public pkgAcquire::Item /*{{{*/
+/** \brief baseclass for the indexes files to manage them all together */
+{
+ void *d;
+ protected:
+ IndexTarget const Target;
+ HashStringList GetExpectedHashesFor(std::string const MetaKey) const;
- /** The hashes of the diff */
- HashStringList result_hashes;
+ bool QueueURI(pkgAcquire::ItemDesc &Item);
- /** The hashes of the file after the diff is applied */
- HashStringList patch_hashes;
+ public:
+ /** \brief storge name until a transaction is finished */
+ std::string PartialFile;
+
+ /** \brief TransactionManager */
+ pkgAcqMetaBase * const TransactionManager;
+
+ enum TransactionStates {
+ TransactionCommit,
+ TransactionAbort,
+ };
+ virtual bool TransactionState(TransactionStates const state);
- /** The size of the file after the diff is applied */
- unsigned long long result_size;
+ virtual std::string DescURI() const { return Target.URI; }
+ virtual HashStringList GetExpectedHashes() const;
+ virtual std::string GetMetaKey() const;
+ virtual bool HashesRequired() const;
- /** The size of the diff itself */
- unsigned long long patch_size;
+
+ pkgAcqTransactionItem(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager, IndexTarget const Target);
+ virtual ~pkgAcqTransactionItem();
+
+ friend class pkgAcqMetaBase;
};
/*}}}*/
- /*}}}*/
-
-class pkgAcqMetaBase : public pkgAcquire::Item
+class APT_HIDDEN pkgAcqMetaBase : public pkgAcqTransactionItem /*{{{*/
+/** \brief the manager of a transaction */
{
void *d;
-
protected:
- std::vector<Item*> Transaction;
+ std::vector<pkgAcqTransactionItem*> Transaction;
+ public:
/** \brief A package-system-specific parser for the meta-index file. */
indexRecords *MetaIndexParser;
+ indexRecords *LastMetaIndexParser;
+ protected:
/** \brief The index files which should be looked up in the meta-index
* and then downloaded.
*/
- const std::vector<IndexTarget*>* IndexTargets;
+ std::vector<IndexTarget> const IndexTargets;
/** \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 Starts downloading the individual index files.
*
* \param verify If \b true, only indices whose expected hashsum
@@ -391,7 +406,7 @@ class pkgAcqMetaBase : public pkgAcquire::Item
* #StatAuthError if there is a mismatch). If verify is \b false,
* no hashsum checking will be performed.
*/
- void QueueIndexes(bool verify);
+ void QueueIndexes(bool const verify);
/** \brief Called when a file is finished being retrieved.
*
@@ -402,15 +417,12 @@ class pkgAcqMetaBase : public pkgAcquire::Item
* \param Message The message block received from the fetch
* subprocess.
*/
- bool CheckDownloadDone(const std::string &Message,
- const std::string &RealURI);
+ bool CheckDownloadDone(pkgAcqTransactionItem * const I, const std::string &Message, HashStringList const &Hashes) const;
/** \brief Queue the downloaded Signature for verification */
- void QueueForSignatureVerify(const std::string &MetaIndexFile,
- const std::string &MetaIndexFileSignature);
+ void QueueForSignatureVerify(pkgAcqTransactionItem * const I, std::string const &File, std::string const &Signature);
- /** \brief get the custom600 header for all pkgAcqMeta */
- std::string GetCustom600Headers(const std::string &RealURI) const;
+ virtual std::string Custom600Headers() const;
/** \brief Called when authentication succeeded.
*
@@ -421,98 +433,53 @@ class pkgAcqMetaBase : public pkgAcquire::Item
* \param Message The message block received from the fetch
* subprocess.
*/
- bool CheckAuthDone(std::string Message, const std::string &RealURI);
+ bool CheckAuthDone(std::string const &Message);
/** Check if the current item should fail at this point */
- bool CheckStopAuthentication(const std::string &RealURI,
- const std::string &Message);
+ bool CheckStopAuthentication(pkgAcquire::Item * const I, const std::string &Message);
/** \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(std::string Message, const std::string &RealURI);
-
+ bool VerifyVendor(std::string const &Message);
+
+ virtual bool TransactionState(TransactionStates const state);
+
public:
+ // This refers more to the Transaction-Manager than the actual file
+ bool IMSHit;
+
+ virtual bool QueueURI(pkgAcquire::ItemDesc &Item);
+ virtual HashStringList GetExpectedHashes() const;
+ virtual bool HashesRequired() const;
+
// transaction code
- void Add(Item *I);
+ void Add(pkgAcqTransactionItem * const I);
void AbortTransaction();
- bool TransactionHasError() APT_PURE;
+ bool TransactionHasError() const;
void CommitTransaction();
- /** \brief Stage (queue) a copy action when the transaction is commited
+ /** \brief Stage (queue) a copy action when the transaction is committed
*/
- void TransactionStageCopy(Item *I,
- const std::string &From,
+ void TransactionStageCopy(pkgAcqTransactionItem * const I,
+ const std::string &From,
const std::string &To);
- /** \brief Stage (queue) a removal action when the transaction is commited
+ /** \brief Stage (queue) a removal action when the transaction is committed
*/
- void TransactionStageRemoval(Item *I, const std::string &FinalFile);
-
- pkgAcqMetaBase(pkgAcquire *Owner,
- const std::vector<IndexTarget*>* IndexTargets,
- indexRecords* MetaIndexParser,
- HashStringList const &ExpectedHashes=HashStringList(),
- pkgAcqMetaBase *TransactionManager=NULL)
- : Item(Owner, ExpectedHashes, TransactionManager),
- MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets),
- AuthPass(false), IMSHit(false) {};
-};
-
-/** \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 pkgAcqMetaBase
-{
- void *d;
+ void TransactionStageRemoval(pkgAcqTransactionItem * const I, const std::string &FinalFile);
- protected:
-
- /** \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.
- */
- std::string RealURI;
+ /** \brief Get the full pathname of the final file for the current URI */
+ virtual std::string GetFinalFilename() const;
- /** \brief The file we need to verify */
- std::string MetaIndexFile;
-
- /** \brief The file we use to verify the MetaIndexFile with */
- std::string MetaIndexFileSignature;
-
- /** \brief Long URI description used in the acquire system */
- std::string URIDesc;
-
- /** \brief Short URI description used in the acquire system */
- std::string ShortDesc;
-
- public:
-
- // Specialized action members
- virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(std::string Message,unsigned long long Size,
- HashStringList const &Hashes,
- pkgAcquire::MethodConfig *Cnf);
- virtual std::string Custom600Headers() const;
- virtual std::string DescURI() {return RealURI; };
-
- /** \brief Create a new pkgAcqMetaSig. */
- pkgAcqMetaSig(pkgAcquire *Owner,
- pkgAcqMetaBase *TransactionManager,
- std::string URI,std::string URIDesc, std::string ShortDesc,
- std::string MetaIndexFile,
- const std::vector<IndexTarget*>* IndexTargets,
- indexRecords* MetaIndexParser);
- virtual ~pkgAcqMetaSig();
+ pkgAcqMetaBase(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
+ std::vector<IndexTarget> const IndexTargets,
+ IndexTarget const &DataTarget,
+ indexRecords* const MetaIndexParser);
+ virtual ~pkgAcqMetaBase();
};
/*}}}*/
-
/** \brief An item that is responsible for downloading the meta-index {{{
* file (i.e., Release) itself and verifying its signature.
*
@@ -523,124 +490,106 @@ class pkgAcqMetaSig : public pkgAcqMetaBase
* otherwise, the expected hashsums will be "" (causing the
* authentication of the index files to be bypassed).
*/
-class pkgAcqMetaIndex : public pkgAcqMetaBase
+class APT_HIDDEN pkgAcqMetaIndex : public pkgAcqMetaBase
{
void *d;
-
protected:
- /** \brief The URI that is actually being downloaded; never
- * modified by pkgAcqMetaIndex.
- */
- std::string RealURI;
-
- std::string URIDesc;
- std::string ShortDesc;
-
- /** \brief The URI of the meta-index file for the detached signature */
- std::string MetaIndexSigURI;
-
- /** \brief A "URI-style" description of the meta-index file */
- std::string MetaIndexSigURIDesc;
-
- /** \brief A brief description of the meta-index file */
- std::string MetaIndexSigShortDesc;
+ IndexTarget const DetachedSigTarget;
/** \brief delayed constructor */
- void Init(std::string URIDesc, std::string ShortDesc);
-
+ void Init(std::string const &URIDesc, std::string const &ShortDesc);
+
public:
+ virtual std::string DescURI() const;
// Specialized action members
- virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes,
- pkgAcquire::MethodConfig *Cnf);
- virtual std::string Custom600Headers() const;
- virtual std::string DescURI() {return RealURI; };
+ virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf);
+ virtual void Done(std::string const &Message, HashStringList const &Hashes,
+ pkgAcquire::MethodConfig const * const Cnf);
virtual void Finished();
/** \brief Create a new pkgAcqMetaIndex. */
- pkgAcqMetaIndex(pkgAcquire *Owner,
- pkgAcqMetaBase *TransactionManager,
- std::string URI,std::string URIDesc, std::string ShortDesc,
- std::string MetaIndexSigURI, std::string MetaIndexSigURIDesc, std::string MetaIndexSigShortDesc,
- const std::vector<IndexTarget*>* IndexTargets,
- indexRecords* MetaIndexParser);
+ pkgAcqMetaIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
+ IndexTarget const &DataTarget, IndexTarget const &DetachedSigTarget,
+ std::vector<IndexTarget> const IndexTargets, indexRecords * const MetaIndexParser);
+ virtual ~pkgAcqMetaIndex();
+
+ friend class pkgAcqMetaSig;
};
/*}}}*/
-/** \brief An item repsonsible for downloading clearsigned metaindexes {{{*/
-class pkgAcqMetaClearSig : public pkgAcqMetaIndex
+/** \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 APT_HIDDEN pkgAcqMetaSig : public pkgAcqTransactionItem
{
void *d;
- /** \brief The URI of the meta-index file for the detached signature */
- std::string MetaIndexURI;
+ pkgAcqMetaIndex * const MetaIndex;
- /** \brief A "URI-style" description of the meta-index file */
- std::string MetaIndexURIDesc;
+ /** \brief The file we use to verify the MetaIndexFile with (not always set!) */
+ std::string MetaIndexFileSignature;
- /** \brief A brief description of the meta-index file */
- std::string MetaIndexShortDesc;
+ protected:
- /** \brief The URI of the detached meta-signature file if the clearsigned one failed. */
- std::string MetaSigURI;
+ /** \brief Get the full pathname of the final file for the current URI */
+ virtual std::string GetFinalFilename() const;
- /** \brief A "URI-style" description of the meta-signature file */
- std::string MetaSigURIDesc;
+ public:
+ virtual bool HashesRequired() const { return false; }
- /** \brief A brief description of the meta-signature file */
- std::string MetaSigShortDesc;
+ // Specialized action members
+ virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf);
+ virtual void Done(std::string const &Message, HashStringList const &Hashes,
+ pkgAcquire::MethodConfig const * const Cnf);
+
+ /** \brief Create a new pkgAcqMetaSig. */
+ pkgAcqMetaSig(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager, IndexTarget const Target,
+ pkgAcqMetaIndex * const MetaIndex);
+ virtual ~pkgAcqMetaSig();
+};
+ /*}}}*/
+/** \brief An item repsonsible for downloading clearsigned metaindexes {{{*/
+class APT_HIDDEN pkgAcqMetaClearSig : public pkgAcqMetaIndex
+{
+ void *d;
+
+ IndexTarget const ClearsignedTarget;
+ IndexTarget const DetachedDataTarget;
+ IndexTarget const DetachedSigTarget;
public:
- virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
+ virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf);
virtual std::string Custom600Headers() const;
- virtual void Done(std::string Message,unsigned long long Size,
- HashStringList const &Hashes,
- pkgAcquire::MethodConfig *Cnf);
+ virtual void Done(std::string const &Message, HashStringList const &Hashes,
+ pkgAcquire::MethodConfig const * const Cnf);
/** \brief Create a new pkgAcqMetaClearSig. */
- pkgAcqMetaClearSig(pkgAcquire *Owner,
- std::string const &URI, std::string const &URIDesc, std::string const &ShortDesc,
- std::string const &MetaIndexURI, std::string const &MetaIndexURIDesc, std::string const &MetaIndexShortDesc,
- std::string const &MetaSigURI, std::string const &MetaSigURIDesc, std::string const &MetaSigShortDesc,
- const std::vector<IndexTarget*>* IndexTargets,
- indexRecords* MetaIndexParser);
+ pkgAcqMetaClearSig(pkgAcquire * const Owner,
+ IndexTarget const &ClearsignedTarget,
+ IndexTarget const &DetachedDataTarget,
+ IndexTarget const &DetachedSigTarget,
+ std::vector<IndexTarget> const IndexTargets,
+ indexRecords * const MetaIndexParser);
virtual ~pkgAcqMetaClearSig();
};
/*}}}*/
-
-
-/** \brief Common base class for all classes that deal with fetching {{{
- indexes
- */
-class pkgAcqBaseIndex : public pkgAcquire::Item
+/** \brief Common base class for all classes that deal with fetching indexes {{{*/
+class APT_HIDDEN pkgAcqBaseIndex : public pkgAcqTransactionItem
{
void *d;
- protected:
- /** \brief Pointer to the IndexTarget data
- */
- const struct IndexTarget * Target;
-
- /** \brief Pointer to the indexRecords parser */
- indexRecords *MetaIndexParser;
-
- /** \brief The MetaIndex Key */
- std::string MetaKey;
-
- /** \brief The URI of the index file to recreate at our end (either
- * by downloading it or by applying partial patches).
- */
- std::string RealURI;
-
- bool VerifyHashByMetaKey(HashStringList const &Hashes);
+ public:
+ /** \brief Get the full pathname of the final file for the current URI */
+ virtual std::string GetFinalFilename() const;
- pkgAcqBaseIndex(pkgAcquire *Owner,
- pkgAcqMetaBase *TransactionManager,
- struct IndexTarget const * const Target,
- HashStringList const &ExpectedHashes,
- indexRecords *MetaIndexParser)
- : Item(Owner, ExpectedHashes, TransactionManager), Target(Target),
- MetaIndexParser(MetaIndexParser) {};
+ pkgAcqBaseIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
+ IndexTarget const Target);
+ virtual ~pkgAcqBaseIndex();
};
/*}}}*/
/** \brief An item that is responsible for fetching an index file of {{{
@@ -652,7 +601,7 @@ class pkgAcqBaseIndex : public pkgAcquire::Item
*
* \sa pkgAcqIndexDiffs, pkgAcqIndex
*/
-class pkgAcqDiffIndex : public pkgAcqBaseIndex
+class APT_HIDDEN pkgAcqDiffIndex : public pkgAcqBaseIndex
{
void *d;
@@ -660,27 +609,25 @@ class pkgAcqDiffIndex : public pkgAcqBaseIndex
/** \brief If \b true, debugging information will be written to std::clog. */
bool Debug;
- /** \brief The index file which will be patched to generate the new
- * file.
- */
- std::string CurrentPackagesFile;
-
/** \brief A description of the Packages file (stored in
* pkgAcquire::ItemDesc::Description).
*/
std::string Description;
- /** \brief If the copy step of the packages file is done
- */
- bool PackagesFileReadyInPartial;
+ /** \brief Get the full pathname of the final file for the current URI */
+ virtual std::string GetFinalFilename() const;
+
+ virtual bool QueueURI(pkgAcquire::ItemDesc &Item);
+ virtual bool TransactionState(TransactionStates const state);
public:
// Specialized action members
- virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes,
- pkgAcquire::MethodConfig *Cnf);
- virtual std::string DescURI() {return RealURI + "Index";};
+ virtual void Failed(std::string const &Message, pkgAcquire::MethodConfig const * const Cnf);
+ virtual void Done(std::string const &Message, HashStringList const &Hashes,
+ pkgAcquire::MethodConfig const * const Cnf);
+ virtual std::string DescURI() const {return Target.URI + "Index";};
virtual std::string Custom600Headers() const;
+ virtual std::string GetMetaKey() const;
/** \brief Parse the Index file for a set of Packages diffs.
*
@@ -692,8 +639,7 @@ class pkgAcqDiffIndex : public pkgAcqBaseIndex
* \return \b true if the Index file was successfully parsed, \b
* false otherwise.
*/
- bool ParseDiffIndex(std::string IndexDiffFile);
-
+ bool ParseDiffIndex(std::string const &IndexDiffFile);
/** \brief Create a new pkgAcqDiffIndex.
*
@@ -704,14 +650,26 @@ class pkgAcqDiffIndex : public pkgAcqBaseIndex
* \param URIDesc A long description of the list file to download.
*
* \param ShortDesc A short description of the list file to download.
- *
- * \param ExpectedHashes The list file's hashsums which are expected.
*/
- pkgAcqDiffIndex(pkgAcquire *Owner,
- pkgAcqMetaBase *TransactionManager,
- struct IndexTarget const * const Target,
- HashStringList const &ExpectedHashes,
- indexRecords *MetaIndexParser);
+ pkgAcqDiffIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
+ IndexTarget const Target);
+ virtual ~pkgAcqDiffIndex();
+ private:
+ APT_HIDDEN void QueueOnIMSHit() const;
+};
+ /*}}}*/
+struct APT_HIDDEN DiffInfo { /*{{{*/
+ /** The filename of the diff. */
+ std::string file;
+
+ /** The hashes of the file after the diff is applied */
+ HashStringList result_hashes;
+
+ /** The hashes of the diff */
+ HashStringList patch_hashes;
+
+ /** The hashes of the compressed diff */
+ HashStringList download_hashes;
};
/*}}}*/
/** \brief An item that is responsible for fetching client-merge patches {{{
@@ -725,7 +683,7 @@ class pkgAcqDiffIndex : public pkgAcqBaseIndex
*
* \sa pkgAcqDiffIndex, pkgAcqIndex
*/
-class pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex
+class APT_HIDDEN pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex
{
void *d;
@@ -767,10 +725,13 @@ class pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex
* This method will fall back to downloading the whole index file
* outright; its arguments are ignored.
*/
- virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes,
- pkgAcquire::MethodConfig *Cnf);
- virtual std::string DescURI() {return RealURI + "Index";};
+ virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf);
+ virtual void Done(std::string const &Message, HashStringList const &Hashes,
+ pkgAcquire::MethodConfig const * const Cnf);
+ virtual std::string Custom600Headers() const;
+ virtual std::string DescURI() const {return Target.URI + "Index";};
+ virtual HashStringList GetExpectedHashes() const;
+ virtual bool HashesRequired() const;
/** \brief Create an index merge-diff item.
*
@@ -783,23 +744,16 @@ class pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex
*
* \param ShortDesc A brief description of this item.
*
- * \param ExpectedHashes 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 patch contains infos about the patch this item is supposed
* to download which were read from the index
*
* \param allPatches contains all related items so that each item can
* check if it was the last one to complete the download step
*/
- pkgAcqIndexMergeDiffs(pkgAcquire *Owner,
- pkgAcqMetaBase *TransactionManager,
- struct IndexTarget const * const Target,
- HashStringList const &ExpectedHash,
- indexRecords *MetaIndexParser,
- DiffInfo const &patch,
+ pkgAcqIndexMergeDiffs(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
+ IndexTarget const Target, DiffInfo const &patch,
std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches);
+ virtual ~pkgAcqIndexMergeDiffs();
};
/*}}}*/
/** \brief An item that is responsible for fetching server-merge patches {{{
@@ -813,7 +767,7 @@ class pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex
*
* \sa pkgAcqDiffIndex, pkgAcqIndex
*/
-class pkgAcqIndexDiffs : public pkgAcqBaseIndex
+class APT_HIDDEN pkgAcqIndexDiffs : public pkgAcqBaseIndex
{
void *d;
@@ -841,7 +795,7 @@ class pkgAcqIndexDiffs : public pkgAcqBaseIndex
* \param allDone If \b true, the file was entirely reconstructed,
* and its md5sum is verified.
*/
- APT_HIDDEN void Finish(bool allDone=false);
+ APT_HIDDEN void Finish(bool const allDone=false);
protected:
@@ -871,26 +825,26 @@ class pkgAcqIndexDiffs : public pkgAcqBaseIndex
/** \brief The diff is currently being fetched. */
StateFetchDiff,
-
- /** \brief The diff is currently being uncompressed. */
- StateUnzipDiff, // FIXME: No longer used
/** \brief The diff is currently being applied. */
StateApplyDiff
} State;
public:
-
+
/** \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(std::string Message,pkgAcquire::MethodConfig *Cnf);
+ virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf);
- virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes,
- pkgAcquire::MethodConfig *Cnf);
- virtual std::string DescURI() {return RealURI + "IndexDiffs";};
+ virtual void Done(std::string const &Message, HashStringList const &Hashes,
+ pkgAcquire::MethodConfig const * const Cnf);
+ virtual std::string Custom600Headers() const;
+ virtual std::string DescURI() const {return Target.URI + "IndexDiffs";};
+ virtual HashStringList GetExpectedHashes() const;
+ virtual bool HashesRequired() const;
/** \brief Create an index diff item.
*
@@ -906,20 +860,14 @@ class pkgAcqIndexDiffs : public pkgAcqBaseIndex
*
* \param ShortDesc A brief description of this item.
*
- * \param ExpectedHashes The expected hashsums 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,
- pkgAcqMetaBase *TransactionManager,
- struct IndexTarget const * const Target,
- HashStringList const &ExpectedHash,
- indexRecords *MetaIndexParser,
- std::vector<DiffInfo> diffs=std::vector<DiffInfo>());
+ pkgAcqIndexDiffs(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
+ IndexTarget const Target,
+ std::vector<DiffInfo> const &diffs=std::vector<DiffInfo>());
+ virtual ~pkgAcqIndexDiffs();
};
/*}}}*/
/** \brief An acquire item that is responsible for fetching an index {{{
@@ -929,7 +877,7 @@ class pkgAcqIndexDiffs : public pkgAcqBaseIndex
*
* \todo Why does pkgAcqIndex have protected members?
*/
-class pkgAcqIndex : public pkgAcqBaseIndex
+class APT_HIDDEN pkgAcqIndex : public pkgAcqBaseIndex
{
void *d;
@@ -947,16 +895,16 @@ class pkgAcqIndex : public pkgAcqBaseIndex
AllStages Stage;
/** \brief Handle what needs to be done when the download is done */
- void StageDownloadDone(std::string Message,
+ void StageDownloadDone(std::string const &Message,
HashStringList const &Hashes,
- pkgAcquire::MethodConfig *Cfg);
+ pkgAcquire::MethodConfig const * const Cfg);
/** \brief Handle what needs to be done when the decompression/copy is
* done
*/
- void StageDecompressDone(std::string Message,
+ void StageDecompressDone(std::string const &Message,
HashStringList const &Hashes,
- pkgAcquire::MethodConfig *Cfg);
+ pkgAcquire::MethodConfig const * const Cfg);
/** \brief If \b set, this partially downloaded file will be
* removed when the download completes.
@@ -972,94 +920,35 @@ class pkgAcqIndex : public pkgAcqBaseIndex
std::string CurrentCompressionExtension;
/** \brief Do the changes needed to fetch via AptByHash (if needed) */
- void InitByHashIfNeeded(const std::string MetaKey);
+ void InitByHashIfNeeded();
/** \brief Auto select the right compression to use */
void AutoSelectCompression();
- /** \brief Get the full pathname of the final file for the current URI
- */
- std::string GetFinalFilename() const;
-
/** \brief Schedule file for verification after a IMS hit */
void ReverifyAfterIMS();
- /** \brief Validate the downloaded index file */
- bool ValidateFile(const std::string &FileName);
+ /** \brief Get the full pathname of the final file for the current URI */
+ virtual std::string GetFinalFilename() const;
+
+ virtual bool TransactionState(TransactionStates const state);
public:
-
// Specialized action members
- virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(std::string Message,unsigned long long Size,
- HashStringList const &Hashes,
- pkgAcquire::MethodConfig *Cnf);
+ virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf);
+ virtual void Done(std::string const &Message, HashStringList const &Hashes,
+ pkgAcquire::MethodConfig const * const Cnf);
virtual std::string Custom600Headers() const;
- virtual std::string DescURI() {return Desc.URI;};
-
- /** \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 ExpectedHashes The expected hashsum of this index file.
- *
- * \param compressExt The compression-related extension with which
- * this index file should be downloaded, or "" to autodetect
- * Compression types can be set with config Acquire::CompressionTypes,
- * default is ".lzma" or ".bz2" (if the needed binaries are present)
- * fallback is ".gz" or none.
- */
- pkgAcqIndex(pkgAcquire *Owner,std::string URI,std::string URIDesc,
- std::string ShortDesc, HashStringList const &ExpectedHashes);
- pkgAcqIndex(pkgAcquire *Owner, pkgAcqMetaBase *TransactionManager,
- IndexTarget const * const Target,
- HashStringList const &ExpectedHash,
- indexRecords *MetaIndexParser);
-
- void Init(std::string const &URI, std::string const &URIDesc,
- std::string const &ShortDesc);
-};
- /*}}}*/
-/** \brief Information about an index file. */ /*{{{*/
-class IndexTarget
-{
- void *d;
-
- public:
- /** \brief A URI from which the index file can be downloaded. */
- std::string URI;
+ virtual std::string DescURI() const {return Desc.URI;};
+ virtual std::string GetMetaKey() const;
- /** \brief A description of the index file. */
- std::string Description;
-
- /** \brief A shorter description of the index file. */
- std::string ShortDesc;
-
- /** \brief The key by which this index file should be
- * looked up within the meta signature file.
- */
- std::string MetaKey;
-
- virtual bool IsOptional() const {
- return false;
- }
-};
- /*}}}*/
-/** \brief Information about an optional index file. */ /*{{{*/
-class OptionalIndexTarget : public IndexTarget
-{
- void *d;
+ pkgAcqIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
+ IndexTarget const Target);
+ virtual ~pkgAcqIndex();
- virtual bool IsOptional() const {
- return true;
- }
+ private:
+ APT_HIDDEN void Init(std::string const &URI, std::string const &URIDesc,
+ std::string const &ShortDesc);
};
/*}}}*/
/** \brief An item that is responsible for fetching a package file. {{{
@@ -1071,6 +960,9 @@ class pkgAcqArchive : public pkgAcquire::Item
{
void *d;
+ bool LocalSource;
+ HashStringList ExpectedHashes;
+
protected:
/** \brief The package version being fetched. */
pkgCache::VerIterator Version;
@@ -1103,21 +995,26 @@ class pkgAcqArchive : public pkgAcquire::Item
/** \brief \b true if this version file is being downloaded from a
* trusted source.
*/
- bool Trusted;
+ bool Trusted;
/** \brief Queue up the next available file for this version. */
bool QueueNext();
-
+
+ /** \brief Get the full pathname of the final file for the current URI */
+ virtual std::string GetFinalFilename() const;
+
public:
-
- virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(std::string Message,unsigned long long Size, HashStringList const &Hashes,
- pkgAcquire::MethodConfig *Cnf);
- virtual std::string DescURI() {return Desc.URI;};
- virtual std::string ShortDesc() {return Desc.ShortDesc;};
+
+ virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf);
+ virtual void Done(std::string const &Message, HashStringList const &Hashes,
+ pkgAcquire::MethodConfig const * const Cnf);
+ virtual std::string DescURI() const;
+ virtual std::string ShortDesc() const;
virtual void Finished();
virtual bool IsTrusted() const;
-
+ virtual HashStringList GetExpectedHashes() const;
+ virtual bool HashesRequired() const;
+
/** \brief Create a new pkgAcqArchive.
*
* \param Owner The pkgAcquire object with which this item is
@@ -1136,9 +1033,124 @@ class pkgAcqArchive : public pkgAcquire::Item
* 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,
+ pkgAcqArchive(pkgAcquire * const Owner,pkgSourceList * const Sources,
+ pkgRecords * const Recs,pkgCache::VerIterator const &Version,
std::string &StoreFilename);
+ virtual ~pkgAcqArchive();
+};
+ /*}}}*/
+/** \brief Retrieve the changelog for the given version {{{
+ *
+ * Downloads the changelog to a temporary file it will also remove again
+ * while it is deconstructed or downloads it to a named location.
+ */
+class pkgAcqChangelog : public pkgAcquire::Item
+{
+ void *d;
+ std::string TemporaryDirectory;
+ std::string const SrcName;
+ std::string const SrcVersion;
+
+ public:
+ // we will never have hashes for changelogs.
+ // If you need verified ones, download the deb and extract the changelog.
+ virtual HashStringList GetExpectedHashes() const { return HashStringList(); }
+ virtual bool HashesRequired() const { return false; }
+
+ // Specialized action members
+ virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf);
+ virtual void Done(std::string const &Message, HashStringList const &CalcHashes,
+ pkgAcquire::MethodConfig const * const Cnf);
+ virtual std::string DescURI() const {return Desc.URI;};
+
+ /** returns the URI to the changelog of this version
+ *
+ * @param Ver is the version to get the changelog for
+ * @return the URI which will be used to acquire the changelog
+ */
+ static std::string URI(pkgCache::VerIterator const &Ver);
+
+ /** returns the URI to the changelog of this version
+ *
+ * \param Rls is the Release file the package comes from
+ * \param Component in which the package resides, can be empty
+ * \param SrcName is the source package name
+ * \param SrcVersion is the source package version
+ * @return the URI which will be used to acquire the changelog
+ */
+ static std::string URI(pkgCache::RlsFileIterator const &Rls,
+ char const * const Component, char const * const SrcName,
+ char const * const SrcVersion);
+
+ /** returns the URI to the changelog of this version
+ *
+ * \param Template URI where CHANGEPATH has to be filled in
+ * \param Component in which the package resides, can be empty
+ * \param SrcName is the source package name
+ * \param SrcVersion is the source package version
+ * @return the URI which will be used to acquire the changelog
+ */
+ static std::string URI(std::string const &Template,
+ char const * const Component, char const * const SrcName,
+ char const * const SrcVersion);
+
+ /** returns the URI template for this release file
+ *
+ * \param Rls is a Release file
+ * @return the URI template to use for this release file
+ */
+ static std::string URITemplate(pkgCache::RlsFileIterator const &Rls);
+
+ /** \brief Create a new pkgAcqChangelog object.
+ *
+ * \param Owner The pkgAcquire object with which this object is
+ * associated.
+ * \param Ver is the version to get the changelog for
+ * \param DestDir The directory the file should be downloaded into.
+ * Will be an autocreated (and cleaned up) temporary directory if not set.
+ * \param DestFilename The filename the file should have in #DestDir
+ * Defaults to sourcepackagename.changelog if not set.
+ */
+ pkgAcqChangelog(pkgAcquire * const Owner, pkgCache::VerIterator const &Ver,
+ std::string const &DestDir="", std::string const &DestFilename="");
+
+ /** \brief Create a new pkgAcqChangelog object.
+ *
+ * \param Owner The pkgAcquire object with which this object is
+ * associated.
+ * \param Rls is the Release file the package comes from
+ * \param Component in which the package resides, can be empty
+ * \param SrcName is the source package name
+ * \param SrcVersion is the source package version
+ * \param DestDir The directory the file should be downloaded into.
+ * Will be an autocreated (and cleaned up) temporary directory if not set.
+ * \param DestFilename The filename the file should have in #DestDir
+ * Defaults to sourcepackagename.changelog if not set.
+ */
+ pkgAcqChangelog(pkgAcquire * const Owner, pkgCache::RlsFileIterator const &Rls,
+ char const * const Component, char const * const SrcName, char const * const SrcVersion,
+ std::string const &DestDir="", std::string const &DestFilename="");
+
+ /** \brief Create a new pkgAcqChangelog object.
+ *
+ * \param Owner The pkgAcquire object with which this object is
+ * associated.
+ * \param URI is to be used to get the changelog
+ * \param SrcName is the source package name
+ * \param SrcVersion is the source package version
+ * \param DestDir The directory the file should be downloaded into.
+ * Will be an autocreated (and cleaned up) temporary directory if not set.
+ * \param DestFilename The filename the file should have in #DestDir
+ * Defaults to sourcepackagename.changelog if not set.
+ */
+ pkgAcqChangelog(pkgAcquire * const Owner, std::string const &URI,
+ char const * const SrcName, char const * const SrcVersion,
+ std::string const &DestDir="", std::string const &DestFilename="");
+
+ virtual ~pkgAcqChangelog();
+
+private:
+ APT_HIDDEN void Init(std::string const &DestDir, std::string const &DestFilename);
};
/*}}}*/
/** \brief Retrieve an arbitrary file to the current directory. {{{
@@ -1155,17 +1167,20 @@ class pkgAcqFile : public pkgAcquire::Item
* Acquire::Retries.
*/
unsigned int Retries;
-
+
/** \brief Should this file be considered a index file */
bool IsIndexFile;
+ HashStringList const ExpectedHashes;
public:
-
+ virtual HashStringList GetExpectedHashes() const;
+ virtual bool HashesRequired() const;
+
// Specialized action members
- virtual void Failed(std::string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(std::string Message,unsigned long long Size, HashStringList const &CalcHashes,
- pkgAcquire::MethodConfig *Cnf);
- virtual std::string DescURI() {return Desc.URI;};
+ virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf);
+ virtual void Done(std::string const &Message, HashStringList const &CalcHashes,
+ pkgAcquire::MethodConfig const * const Cnf);
+ virtual std::string DescURI() const {return Desc.URI;};
virtual std::string Custom600Headers() const;
/** \brief Create a new pkgAcqFile object.
@@ -1199,10 +1214,11 @@ class pkgAcqFile : public pkgAcquire::Item
* is the absolute name to which the file should be downloaded.
*/
- pkgAcqFile(pkgAcquire *Owner, std::string URI, HashStringList const &Hashes, unsigned long long Size,
- std::string Desc, std::string ShortDesc,
- const std::string &DestDir="", const std::string &DestFilename="",
- bool IsIndexFile=false);
+ pkgAcqFile(pkgAcquire * const Owner, std::string const &URI, HashStringList const &Hashes, unsigned long long const Size,
+ std::string const &Desc, std::string const &ShortDesc,
+ std::string const &DestDir="", std::string const &DestFilename="",
+ bool const IsIndexFile=false);
+ virtual ~pkgAcqFile();
};
/*}}}*/
/** @} */
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index c29ef469e..d3aff4d5e 100644
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -376,7 +376,10 @@ int pkgAcqMethod::Run(bool Single)
Tmp->ExpectedHashes.push_back(HashString(*t, hash));
}
char *End;
- Tmp->MaximumSize = strtoll(LookupTag(Message, "Maximum-Size", "0").c_str(), &End, 10);
+ if (Tmp->ExpectedHashes.FileSize() > 0)
+ Tmp->MaximumSize = Tmp->ExpectedHashes.FileSize();
+ else
+ Tmp->MaximumSize = strtoll(LookupTag(Message, "Maximum-Size", "0").c_str(), &End, 10);
Tmp->Next = 0;
// Append it to the list
@@ -385,14 +388,14 @@ int pkgAcqMethod::Run(bool Single)
*I = Tmp;
if (QueueBack == 0)
QueueBack = Tmp;
-
+
// Notify that this item is to be fetched.
- if (Fetch(Tmp) == false)
+ if (URIAcquire(Message, Tmp) == false)
Fail();
-
- break;
- }
- }
+
+ break;
+ }
+ }
}
Exit();
@@ -400,8 +403,6 @@ int pkgAcqMethod::Run(bool Single)
}
/*}}}*/
// AcqMethod::PrintStatus - privately really send a log/status message /*{{{*/
-// ---------------------------------------------------------------------
-/* */
void pkgAcqMethod::PrintStatus(char const * const header, const char* Format,
va_list &args) const
{
@@ -477,5 +478,9 @@ void pkgAcqMethod::Dequeue() { /*{{{*/
delete Tmp;
}
/*}}}*/
-
pkgAcqMethod::~pkgAcqMethod() {}
+
+pkgAcqMethod::FetchItem::FetchItem() {}
+pkgAcqMethod::FetchItem::~FetchItem() {}
+
+pkgAcqMethod::FetchResult::~FetchResult() {}
diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index 399454892..f6659ef1f 100644
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -1,6 +1,5 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: acquire-method.h,v 1.15.2.1 2003/12/24 23:09:17 mdz Exp $
/* ######################################################################
Acquire Method - Method helper class + functions
@@ -53,6 +52,11 @@ class pkgAcqMethod
// for when we know it or a arbitrary limit when we don't know the
// filesize (like a InRelease file)
unsigned long long MaximumSize;
+
+ FetchItem();
+ virtual ~FetchItem();
+ private:
+ void *d;
};
struct FetchResult
@@ -67,6 +71,9 @@ class pkgAcqMethod
void TakeHashes(class Hashes &Hash);
FetchResult();
+ virtual ~FetchResult();
+ private:
+ void *d;
};
// State
@@ -76,11 +83,12 @@ class pkgAcqMethod
std::string FailReason;
std::string UsedMirror;
std::string IP;
-
+
// Handlers for messages
virtual bool Configuration(std::string Message);
virtual bool Fetch(FetchItem * /*Item*/) {return true;};
-
+ virtual bool URIAcquire(std::string const &/*Message*/, FetchItem *Itm) { return Fetch(Itm); };
+
// Outgoing messages
void Fail(bool Transient = false);
inline void Fail(const char *Why, bool Transient = false) {Fail(std::string(Why),Transient);};
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc
index 724bdfd49..ef195d44b 100644
--- a/apt-pkg/acquire-worker.cc
+++ b/apt-pkg/acquire-worker.cc
@@ -43,20 +43,6 @@
using namespace std;
-static void ChangeOwnerAndPermissionOfFile(char const * const requester, char const * const file, char const * const user, char const * const group, mode_t const mode) /*{{{*/
-{
- if (getuid() == 0 && strlen(user) != 0 && strlen(group) != 0) // if we aren't root, we can't chown, so don't try it
- {
- // ensure the file is owned by root and has good permissions
- struct passwd const * const pw = getpwnam(user);
- struct group const * const gr = getgrnam(group);
- if (pw != NULL && gr != NULL && chown(file, pw->pw_uid, gr->gr_gid) != 0)
- _error->WarningE(requester, "chown to %s:%s of file %s failed", user, group, file);
- }
- if (chmod(file, mode) != 0)
- _error->WarningE(requester, "chmod 0%o of file %s failed", mode, file);
-}
- /*}}}*/
// Worker::Worker - Constructor for Queue startup /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -69,8 +55,8 @@ pkgAcquire::Worker::Worker(Queue *Q,MethodConfig *Cnf,
CurrentItem = 0;
TotalSize = 0;
CurrentSize = 0;
-
- Construct();
+
+ Construct();
}
/*}}}*/
// Worker::Worker - Constructor for method config startup /*{{{*/
@@ -84,8 +70,8 @@ pkgAcquire::Worker::Worker(MethodConfig *Cnf)
CurrentItem = 0;
TotalSize = 0;
CurrentSize = 0;
-
- Construct();
+
+ Construct();
}
/*}}}*/
// Worker::Construct - Constructor helper /*{{{*/
@@ -150,7 +136,7 @@ bool pkgAcquire::Worker::Start()
}
for (int I = 0; I != 4; I++)
SetCloseExec(Pipes[I],true);
-
+
// Fork off the process
Process = ExecFork();
if (Process == 0)
@@ -159,9 +145,9 @@ bool pkgAcquire::Worker::Start()
dup2(Pipes[1],STDOUT_FILENO);
dup2(Pipes[2],STDIN_FILENO);
SetCloseExec(STDOUT_FILENO,false);
- SetCloseExec(STDIN_FILENO,false);
+ SetCloseExec(STDIN_FILENO,false);
SetCloseExec(STDERR_FILENO,false);
-
+
const char *Args[2];
Args[0] = Method.c_str();
Args[1] = 0;
@@ -179,7 +165,7 @@ bool pkgAcquire::Worker::Start()
close(Pipes[2]);
OutReady = false;
InReady = true;
-
+
// Read the configuration data
if (WaitFd(InFd) == false ||
ReadMessages() == false)
@@ -188,7 +174,7 @@ bool pkgAcquire::Worker::Start()
RunMessages();
if (OwnerQ != 0)
SendConfiguration();
-
+
return true;
}
/*}}}*/
@@ -215,7 +201,7 @@ bool pkgAcquire::Worker::RunMessages()
if (Debug == true)
clog << " <- " << Access << ':' << QuoteString(Message,"\n") << endl;
-
+
// Fetch the message number
char *End;
int Number = strtol(Message.c_str(),&End,10);
@@ -229,15 +215,15 @@ bool pkgAcquire::Worker::RunMessages()
// update used mirror
string UsedMirror = LookupTag(Message,"UsedMirror", "");
- if (!UsedMirror.empty() &&
+ if (!UsedMirror.empty() &&
Itm &&
- Itm->Description.find(" ") != string::npos)
+ Itm->Description.find(" ") != string::npos)
{
Itm->Description.replace(0, Itm->Description.find(" "), UsedMirror);
// FIXME: will we need this as well?
//Itm->ShortDesc = UsedMirror;
}
-
+
// Determine the message number and dispatch
switch (Number)
{
@@ -246,18 +232,18 @@ bool pkgAcquire::Worker::RunMessages()
if (Capabilities(Message) == false)
return _error->Error("Unable to process Capabilities message from %s",Access.c_str());
break;
-
+
// 101 Log
case 101:
if (Debug == true)
clog << " <- (log) " << LookupTag(Message,"Message") << endl;
break;
-
+
// 102 Status
case 102:
Status = LookupTag(Message,"Message");
break;
-
+
// 103 Redirect
case 103:
{
@@ -266,27 +252,36 @@ bool pkgAcquire::Worker::RunMessages()
_error->Error("Method gave invalid 103 Redirect message");
break;
}
-
+
string NewURI = LookupTag(Message,"New-URI",URI.c_str());
Itm->URI = NewURI;
ItemDone();
- pkgAcquire::Item *Owner = Itm->Owner;
- pkgAcquire::ItemDesc Desc = *Itm;
-
// Change the status so that it can be dequeued
- Owner->Status = pkgAcquire::Item::StatIdle;
+ for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
+ {
+ pkgAcquire::Item *Owner = *O;
+ Owner->Status = pkgAcquire::Item::StatIdle;
+ }
// Mark the item as done (taking care of all queues)
// and then put it in the main queue again
+ std::vector<Item*> const ItmOwners = Itm->Owners;
OwnerQ->ItemDone(Itm);
- OwnerQ->Owner->Enqueue(Desc);
+ Itm = NULL;
+ for (pkgAcquire::Queue::QItem::owner_iterator O = ItmOwners.begin(); O != ItmOwners.end(); ++O)
+ {
+ pkgAcquire::Item *Owner = *O;
+ pkgAcquire::ItemDesc desc = Owner->GetItemDesc();
+ desc.URI = NewURI;
+ OwnerQ->Owner->Enqueue(desc);
- if (Log != 0)
- Log->Done(Desc);
+ if (Log != 0)
+ Log->Done(Owner->GetItemDesc());
+ }
break;
}
-
+
// 200 URI Start
case 200:
{
@@ -295,23 +290,27 @@ bool pkgAcquire::Worker::RunMessages()
_error->Error("Method gave invalid 200 URI Start message");
break;
}
-
+
CurrentItem = Itm;
CurrentSize = 0;
TotalSize = strtoull(LookupTag(Message,"Size","0").c_str(), NULL, 10);
ResumePoint = strtoull(LookupTag(Message,"Resume-Point","0").c_str(), NULL, 10);
- Itm->Owner->Start(Message,strtoull(LookupTag(Message,"Size","0").c_str(), NULL, 10));
+ for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
+ {
+ (*O)->Start(Message, TotalSize);
- // Display update before completion
- if (Log != 0 && Log->MorePulses == true)
- Log->Pulse(Itm->Owner->GetOwner());
-
- if (Log != 0)
- Log->Fetch(*Itm);
+ // Display update before completion
+ if (Log != 0)
+ {
+ if (Log->MorePulses == true)
+ Log->Pulse((*O)->GetOwner());
+ Log->Fetch((*O)->GetItemDesc());
+ }
+ }
break;
}
-
+
// 201 URI Done
case 201:
{
@@ -320,72 +319,113 @@ bool pkgAcquire::Worker::RunMessages()
_error->Error("Method gave invalid 201 URI Done message");
break;
}
-
- pkgAcquire::Item *Owner = Itm->Owner;
- pkgAcquire::ItemDesc Desc = *Itm;
- if (RealFileExists(Owner->DestFile))
- ChangeOwnerAndPermissionOfFile("201::URIDone", Owner->DestFile.c_str(), "root", "root", 0644);
+ PrepareFiles("201::URIDone", Itm);
// Display update before completion
if (Log != 0 && Log->MorePulses == true)
- Log->Pulse(Owner->GetOwner());
-
- OwnerQ->ItemDone(Itm);
- unsigned long long const ServerSize = strtoull(LookupTag(Message,"Size","0").c_str(), NULL, 10);
- bool isHit = StringToBool(LookupTag(Message,"IMS-Hit"),false) ||
- StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false);
- // Using the https method the server might return 200, but the
- // If-Modified-Since condition is not satsified, libcurl will
- // discard the download. In this case, however, TotalSize will be
- // set to the actual size of the file, while ServerSize will be set
- // to 0. Therefore, if the item is marked as a hit and the
- // downloaded size (ServerSize) is 0, we ignore TotalSize.
- if (TotalSize != 0 && (!isHit || ServerSize != 0) && ServerSize != TotalSize)
- _error->Warning("Size of file %s is not what the server reported %s %llu",
- Owner->DestFile.c_str(), LookupTag(Message,"Size","0").c_str(),TotalSize);
-
- // see if there is a hash to verify
- HashStringList RecivedHashes;
- HashStringList expectedHashes = Owner->HashSums();
- for (HashStringList::const_iterator hs = expectedHashes.begin(); hs != expectedHashes.end(); ++hs)
- {
- std::string const tagname = hs->HashType() + "-Hash";
- std::string const hashsum = LookupTag(Message, tagname.c_str());
- if (hashsum.empty() == false)
- RecivedHashes.push_back(HashString(hs->HashType(), hashsum));
- }
+ for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
+ Log->Pulse((*O)->GetOwner());
- if(_config->FindB("Debug::pkgAcquire::Auth", false) == true)
+ std::string const filename = LookupTag(Message, "Filename", Itm->Owner->DestFile.c_str());
+ HashStringList ReceivedHashes;
{
- std::clog << "201 URI Done: " << Owner->DescURI() << endl
- << "RecivedHash:" << endl;
- for (HashStringList::const_iterator hs = RecivedHashes.begin(); hs != RecivedHashes.end(); ++hs)
- std::clog << "\t- " << hs->toStr() << std::endl;
- std::clog << "ExpectedHash:" << endl;
- for (HashStringList::const_iterator hs = expectedHashes.begin(); hs != expectedHashes.end(); ++hs)
- std::clog << "\t- " << hs->toStr() << std::endl;
- std::clog << endl;
+ // see if we got hashes to verify
+ for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type)
+ {
+ std::string const tagname = std::string(*type) + "-Hash";
+ std::string const hashsum = LookupTag(Message, tagname.c_str());
+ if (hashsum.empty() == false)
+ ReceivedHashes.push_back(HashString(*type, hashsum));
+ }
+ // not all methods always sent Hashes our way
+ if (ReceivedHashes.usable() == false)
+ {
+ HashStringList const ExpectedHashes = Itm->GetExpectedHashes();
+ if (ExpectedHashes.usable() == true && RealFileExists(filename))
+ {
+ Hashes calc(ExpectedHashes);
+ FileFd file(filename, FileFd::ReadOnly, FileFd::None);
+ calc.AddFD(file);
+ ReceivedHashes = calc.GetHashStringList();
+ }
+ }
}
- Owner->Done(Message, ServerSize, RecivedHashes, Config);
- ItemDone();
- // Log that we are done
- if (Log != 0)
+ // only local files can refer other filenames and counting them as fetched would be unfair
+ if (Log != NULL && filename != Itm->Owner->DestFile)
+ Log->Fetched(ReceivedHashes.FileSize(),atoi(LookupTag(Message,"Resume-Point","0").c_str()));
+
+ std::vector<Item*> const ItmOwners = Itm->Owners;
+ OwnerQ->ItemDone(Itm);
+ Itm = NULL;
+
+ bool const isIMSHit = StringToBool(LookupTag(Message,"IMS-Hit"),false) ||
+ StringToBool(LookupTag(Message,"Alt-IMS-Hit"),false);
+ for (pkgAcquire::Queue::QItem::owner_iterator O = ItmOwners.begin(); O != ItmOwners.end(); ++O)
{
- if (isHit)
+ pkgAcquire::Item * const Owner = *O;
+ HashStringList const ExpectedHashes = Owner->GetExpectedHashes();
+ if(_config->FindB("Debug::pkgAcquire::Auth", false) == true)
+ {
+ std::clog << "201 URI Done: " << Owner->DescURI() << endl
+ << "ReceivedHash:" << endl;
+ for (HashStringList::const_iterator hs = ReceivedHashes.begin(); hs != ReceivedHashes.end(); ++hs)
+ std::clog << "\t- " << hs->toStr() << std::endl;
+ std::clog << "ExpectedHash:" << endl;
+ for (HashStringList::const_iterator hs = ExpectedHashes.begin(); hs != ExpectedHashes.end(); ++hs)
+ std::clog << "\t- " << hs->toStr() << std::endl;
+ std::clog << endl;
+ }
+
+ // decide if what we got is what we expected
+ bool consideredOkay = false;
+ if (ExpectedHashes.usable())
+ {
+ if (ReceivedHashes.usable() == false)
+ {
+ /* IMS-Hits can't be checked here as we will have uncompressed file,
+ but the hashes for the compressed file. What we have was good through
+ so all we have to ensure later is that we are not stalled. */
+ consideredOkay = isIMSHit;
+ }
+ else if (ReceivedHashes == ExpectedHashes)
+ consideredOkay = true;
+ else
+ consideredOkay = false;
+
+ }
+ else if (Owner->HashesRequired() == true)
+ consideredOkay = false;
+ else
+ consideredOkay = true;
+
+ if (consideredOkay == true)
{
- /* Hide 'hits' for local only sources - we also manage to
- hide gets */
- if (Config->LocalOnly == false)
- Log->IMSHit(Desc);
- }
+ Owner->Done(Message, ReceivedHashes, Config);
+
+ // Log that we are done
+ if (Log != 0)
+ {
+ if (isIMSHit)
+ Log->IMSHit(Owner->GetItemDesc());
+ else
+ Log->Done(Owner->GetItemDesc());
+ }
+ }
else
- Log->Done(Desc);
+ {
+ Owner->Status = pkgAcquire::Item::StatAuthError;
+ Owner->Failed(Message,Config);
+
+ if (Log != 0)
+ Log->Fail(Owner->GetItemDesc());
+ }
}
+ ItemDone();
break;
- }
-
+ }
+
// 400 URI Failure
case 400:
{
@@ -396,44 +436,46 @@ bool pkgAcquire::Worker::RunMessages()
break;
}
+ PrepareFiles("400::URIFailure", Itm);
+
// Display update before completion
if (Log != 0 && Log->MorePulses == true)
- Log->Pulse(Itm->Owner->GetOwner());
-
- pkgAcquire::Item *Owner = Itm->Owner;
- pkgAcquire::ItemDesc Desc = *Itm;
-
- if (RealFileExists(Owner->DestFile))
- ChangeOwnerAndPermissionOfFile("400::URIFailure", Owner->DestFile.c_str(), "root", "root", 0644);
+ for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
+ Log->Pulse((*O)->GetOwner());
+ std::vector<Item*> const ItmOwners = Itm->Owners;
OwnerQ->ItemDone(Itm);
+ Itm = NULL;
+
+ for (pkgAcquire::Queue::QItem::owner_iterator O = ItmOwners.begin(); O != ItmOwners.end(); ++O)
+ {
+ // set some status
+ if(LookupTag(Message,"FailReason") == "Timeout" ||
+ LookupTag(Message,"FailReason") == "TmpResolveFailure" ||
+ LookupTag(Message,"FailReason") == "ResolveFailure" ||
+ LookupTag(Message,"FailReason") == "ConnectionRefused")
+ (*O)->Status = pkgAcquire::Item::StatTransientNetworkError;
- // 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;
+ (*O)->Failed(Message,Config);
- Owner->Failed(Message,Config);
+ if (Log != 0)
+ Log->Fail((*O)->GetItemDesc());
+ }
ItemDone();
- if (Log != 0)
- Log->Fail(Desc);
-
break;
- }
-
+ }
+
// 401 General Failure
case 401:
_error->Error("Method %s General failure: %s",Access.c_str(),LookupTag(Message,"Message").c_str());
break;
-
+
// 403 Media Change
case 403:
- MediaChange(Message);
+ MediaChange(Message);
break;
- }
+ }
}
return true;
}
@@ -446,7 +488,7 @@ bool pkgAcquire::Worker::Capabilities(string Message)
{
if (Config == 0)
return true;
-
+
Config->Version = LookupTag(Message,"Version");
Config->SingleInstance = StringToBool(LookupTag(Message,"Single-Instance"),false);
Config->Pipeline = StringToBool(LookupTag(Message,"Pipeline"),false);
@@ -461,13 +503,13 @@ bool pkgAcquire::Worker::Capabilities(string Message)
clog << "Configured access method " << Config->Access << endl;
clog << "Version:" << Config->Version <<
" SingleInstance:" << Config->SingleInstance <<
- " Pipeline:" << Config->Pipeline <<
- " SendConfig:" << Config->SendConfig <<
- " LocalOnly: " << Config->LocalOnly <<
- " NeedsCleanup: " << Config->NeedsCleanup <<
+ " Pipeline:" << Config->Pipeline <<
+ " SendConfig:" << Config->SendConfig <<
+ " LocalOnly: " << Config->LocalOnly <<
+ " NeedsCleanup: " << Config->NeedsCleanup <<
" Removable: " << Config->Removable << endl;
}
-
+
return true;
}
/*}}}*/
@@ -477,10 +519,10 @@ bool pkgAcquire::Worker::Capabilities(string Message)
bool pkgAcquire::Worker::MediaChange(string Message)
{
int status_fd = _config->FindI("APT::Status-Fd",-1);
- if(status_fd > 0)
+ if(status_fd > 0)
{
string Media = LookupTag(Message,"Media");
- string Drive = LookupTag(Message,"Drive");
+ string Drive = LookupTag(Message,"Drive");
ostringstream msg,status;
ioprintf(msg,_("Please insert the disc labeled: "
"'%s' "
@@ -550,21 +592,29 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item)
{
if (OutFd == -1)
return false;
-
+
string Message = "600 URI Acquire\n";
Message.reserve(300);
Message += "URI: " + Item->URI;
Message += "\nFilename: " + Item->Owner->DestFile;
- HashStringList const hsl = Item->Owner->HashSums();
+
+ HashStringList const hsl = Item->GetExpectedHashes();
for (HashStringList::const_iterator hs = hsl.begin(); hs != hsl.end(); ++hs)
Message += "\nExpected-" + hs->HashType() + ": " + hs->HashValue();
- if(Item->Owner->FileSize > 0)
+
+ if (hsl.FileSize() == 0)
{
- string MaximumSize;
- strprintf(MaximumSize, "%llu", Item->Owner->FileSize);
- Message += "\nMaximum-Size: " + MaximumSize;
+ unsigned long long FileSize = Item->GetMaximumSize();
+ if(FileSize > 0)
+ {
+ string MaximumSize;
+ strprintf(MaximumSize, "%llu", FileSize);
+ Message += "\nMaximum-Size: " + MaximumSize;
+ }
}
- Message += Item->Owner->Custom600Headers();
+
+ Item->SyncDestinationFiles();
+ Message += Item->Custom600Headers();
Message += "\n\n";
if (RealFileExists(Item->Owner->DestFile))
@@ -578,7 +628,7 @@ bool pkgAcquire::Worker::QueueItem(pkgAcquire::Queue::QItem *Item)
clog << " -> " << Access << ':' << QuoteString(Message,"\n") << endl;
OutQueue += Message;
OutReady = true;
-
+
return true;
}
/*}}}*/
@@ -600,7 +650,7 @@ bool pkgAcquire::Worker::OutFdReady()
OutQueue.erase(0,Res);
if (OutQueue.empty() == true)
OutReady = false;
-
+
return true;
}
/*}}}*/
@@ -622,7 +672,7 @@ bool pkgAcquire::Worker::InFdReady()
bool pkgAcquire::Worker::MethodFailure()
{
_error->Error("Method %s has died unexpectedly!",Access.c_str());
-
+
// do not reap the child here to show meaningfull error to the user
ExecWait(Process,Access.c_str(),false);
Process = -1;
@@ -634,26 +684,22 @@ bool pkgAcquire::Worker::MethodFailure()
InReady = false;
OutQueue = string();
MessageQueue.erase(MessageQueue.begin(),MessageQueue.end());
-
+
return false;
}
/*}}}*/
-// Worker::Pulse - Called periodically /*{{{*/
+// Worker::Pulse - Called periodically /*{{{*/
// ---------------------------------------------------------------------
/* */
void pkgAcquire::Worker::Pulse()
{
if (CurrentItem == 0)
return;
-
+
struct stat Buf;
if (stat(CurrentItem->Owner->DestFile.c_str(),&Buf) != 0)
return;
CurrentSize = Buf.st_size;
-
- // Hmm? Should not happen...
- if (CurrentSize > TotalSize && TotalSize != 0)
- TotalSize = CurrentSize;
}
/*}}}*/
// Worker::ItemDone - Called when the current item is finished /*{{{*/
@@ -667,3 +713,33 @@ void pkgAcquire::Worker::ItemDone()
Status = string();
}
/*}}}*/
+void pkgAcquire::Worker::PrepareFiles(char const * const caller, pkgAcquire::Queue::QItem const * const Itm)/*{{{*/
+{
+ if (RealFileExists(Itm->Owner->DestFile))
+ {
+ ChangeOwnerAndPermissionOfFile(caller, Itm->Owner->DestFile.c_str(), "root", "root", 0644);
+ std::string const filename = Itm->Owner->DestFile;
+ for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
+ {
+ pkgAcquire::Item const * const Owner = *O;
+ if (Owner->DestFile == filename)
+ continue;
+ unlink(Owner->DestFile.c_str());
+ if (link(filename.c_str(), Owner->DestFile.c_str()) != 0)
+ {
+ // diferent mounts can't happen for us as we download to lists/ by default,
+ // but if the system is reused by others the locations can potentially be on
+ // different disks, so use symlink as poor-men replacement.
+ // FIXME: Real copying as last fallback, but that is costly, so offload to a method preferable
+ if (symlink(filename.c_str(), Owner->DestFile.c_str()) != 0)
+ _error->Error("Can't create (sym)link of file %s to %s", filename.c_str(), Owner->DestFile.c_str());
+ }
+ }
+ }
+ else
+ {
+ for (pkgAcquire::Queue::QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
+ unlink((*O)->DestFile.c_str());
+ }
+}
+ /*}}}*/
diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h
index db8889c8e..b8e8fefed 100644
--- a/apt-pkg/acquire-worker.h
+++ b/apt-pkg/acquire-worker.h
@@ -1,6 +1,5 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: acquire-worker.h,v 1.12 2001/02/20 07:03:17 jgg Exp $
/* ######################################################################
Acquire Worker - Worker process manager
@@ -326,6 +325,9 @@ class pkgAcquire::Worker : public WeakPointable
* \b false, also rudely interrupts the worker with a SIGINT.
*/
virtual ~Worker();
+
+private:
+ APT_HIDDEN void PrepareFiles(char const * const caller, pkgAcquire::Queue::QItem const * const Itm);
};
/** @} */
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 2c89c2dea..75df858a8 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -23,6 +23,7 @@
#include <apt-pkg/strutl.h>
#include <apt-pkg/fileutl.h>
+#include <algorithm>
#include <string>
#include <vector>
#include <iostream>
@@ -92,8 +93,11 @@ void pkgAcquire::Initialize()
static bool SetupAPTPartialDirectory(std::string const &grand, std::string const &parent)
{
std::string const partial = parent + "partial";
- if (CreateAPTDirectoryIfNeeded(grand, partial) == false &&
- CreateAPTDirectoryIfNeeded(parent, partial) == false)
+ mode_t const mode = umask(S_IWGRP | S_IWOTH);
+ bool const creation_fail = (CreateAPTDirectoryIfNeeded(grand, partial) == false &&
+ CreateAPTDirectoryIfNeeded(parent, partial) == false);
+ umask(mode);
+ if (creation_fail == true)
return false;
std::string const SandboxUser = _config->Find("APT::Sandbox::User");
@@ -152,6 +156,8 @@ bool pkgAcquire::GetLock(std::string const &Lock)
return true;
// Lock the directory this acquire object will work in
+ if (LockFD != -1)
+ close(LockFD);
LockFD = ::GetLock(flCombine(Lock, "lock"));
if (LockFD == -1)
return _error->Error(_("Unable to lock directory %s"), Lock.c_str());
@@ -674,10 +680,14 @@ bool pkgAcquire::Queue::Enqueue(ItemDesc &Item)
{
QItem **I = &Items;
// move to the end of the queue and check for duplicates here
+ HashStringList const hsl = Item.Owner->GetExpectedHashes();
for (; *I != 0; I = &(*I)->Next)
- if (Item.URI == (*I)->URI)
+ if (Item.URI == (*I)->URI || hsl == (*I)->Owner->GetExpectedHashes())
{
- Item.Owner->Status = Item::StatDone;
+ if (_config->FindB("Debug::pkgAcquire::Worker",false) == true)
+ std::cerr << " @ Queue: Action combined for " << Item.URI << " and " << (*I)->URI << std::endl;
+ (*I)->Owners.push_back(Item.Owner);
+ Item.Owner->Status = (*I)->Owner->Status;
return false;
}
@@ -700,13 +710,13 @@ 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)
+ if (Owner == (*I)->Owner)
{
QItem *Jnk= *I;
*I = (*I)->Next;
@@ -717,7 +727,7 @@ bool pkgAcquire::Queue::Dequeue(Item *Owner)
else
I = &(*I)->Next;
}
-
+
return Res;
}
/*}}}*/
@@ -794,9 +804,12 @@ pkgAcquire::Queue::QItem *pkgAcquire::Queue::FindItem(string URI,pkgAcquire::Wor
bool pkgAcquire::Queue::ItemDone(QItem *Itm)
{
PipeDepth--;
- if (Itm->Owner->Status == pkgAcquire::Item::StatFetching)
- Itm->Owner->Status = pkgAcquire::Item::StatDone;
-
+ for (QItem::owner_iterator O = Itm->Owners.begin(); O != Itm->Owners.end(); ++O)
+ {
+ if ((*O)->Status == pkgAcquire::Item::StatFetching)
+ (*O)->Status = pkgAcquire::Item::StatDone;
+ }
+
if (Itm->Owner->QueueCounter <= 1)
Owner->Dequeue(Itm->Owner);
else
@@ -804,7 +817,7 @@ bool pkgAcquire::Queue::ItemDone(QItem *Itm)
Dequeue(Itm->Owner);
Owner->Bump();
}
-
+
return Cycle();
}
/*}}}*/
@@ -819,7 +832,7 @@ bool pkgAcquire::Queue::Cycle()
if (PipeDepth < 0)
return _error->Error("Pipedepth failure");
-
+
// Look for a queable item
QItem *I = Items;
while (PipeDepth < (signed)MaxPipeDepth)
@@ -827,18 +840,19 @@ bool pkgAcquire::Queue::Cycle()
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;
+ for (QItem::owner_iterator O = I->Owners.begin(); O != I->Owners.end(); ++O)
+ (*O)->Status = pkgAcquire::Item::StatFetching;
PipeDepth++;
if (Workers->QueueItem(I) == false)
return false;
}
-
+
return true;
}
/*}}}*/
@@ -850,10 +864,98 @@ void pkgAcquire::Queue::Bump()
Cycle();
}
/*}}}*/
+HashStringList pkgAcquire::Queue::QItem::GetExpectedHashes() const /*{{{*/
+{
+ /* each Item can have multiple owners and each owner might have different
+ hashes, even if that is unlikely in practice and if so at least some
+ owners will later fail. There is one situation through which is not a
+ failure and still needs this handling: Two owners who expect the same
+ file, but one owner only knows the SHA1 while the other only knows SHA256. */
+ HashStringList superhsl;
+ for (pkgAcquire::Queue::QItem::owner_iterator O = Owners.begin(); O != Owners.end(); ++O)
+ {
+ HashStringList const hsl = (*O)->GetExpectedHashes();
+ if (hsl.usable() == false)
+ continue;
+ if (superhsl.usable() == false)
+ superhsl = hsl;
+ else
+ {
+ // we merge both lists - if we find disagreement send no hashes
+ HashStringList::const_iterator hs = hsl.begin();
+ for (; hs != hsl.end(); ++hs)
+ if (superhsl.push_back(*hs) == false)
+ break;
+ if (hs != hsl.end())
+ {
+ superhsl.clear();
+ break;
+ }
+ }
+ }
+ return superhsl;
+}
+ /*}}}*/
+APT_PURE unsigned long long pkgAcquire::Queue::QItem::GetMaximumSize() const /*{{{*/
+{
+ unsigned long long Maximum = std::numeric_limits<unsigned long long>::max();
+ for (pkgAcquire::Queue::QItem::owner_iterator O = Owners.begin(); O != Owners.end(); ++O)
+ {
+ if ((*O)->FileSize == 0)
+ continue;
+ Maximum = std::min(Maximum, (*O)->FileSize);
+ }
+ if (Maximum == std::numeric_limits<unsigned long long>::max())
+ return 0;
+ return Maximum;
+}
+ /*}}}*/
+void pkgAcquire::Queue::QItem::SyncDestinationFiles() const /*{{{*/
+{
+ /* ensure that the first owner has the best partial file of all and
+ the rest have (potentially dangling) symlinks to it so that
+ everything (like progress reporting) finds it easily */
+ std::string superfile = Owner->DestFile;
+ off_t supersize = 0;
+ for (pkgAcquire::Queue::QItem::owner_iterator O = Owners.begin(); O != Owners.end(); ++O)
+ {
+ if ((*O)->DestFile == superfile)
+ continue;
+ struct stat file;
+ if (lstat((*O)->DestFile.c_str(),&file) == 0)
+ {
+ if ((file.st_mode & S_IFREG) == 0)
+ unlink((*O)->DestFile.c_str());
+ else if (supersize < file.st_size)
+ {
+ supersize = file.st_size;
+ unlink(superfile.c_str());
+ rename((*O)->DestFile.c_str(), superfile.c_str());
+ }
+ else
+ unlink((*O)->DestFile.c_str());
+ if (symlink(superfile.c_str(), (*O)->DestFile.c_str()) != 0)
+ {
+ ; // not a problem per-se and no real alternative
+ }
+ }
+ }
+}
+ /*}}}*/
+std::string pkgAcquire::Queue::QItem::Custom600Headers() const /*{{{*/
+{
+ /* The others are relatively easy to merge, but this one?
+ Lets not merge and see how far we can run with it…
+ Likely, nobody will ever notice as all the items will
+ be of the same class and hence generate the same headers. */
+ return Owner->Custom600Headers();
+}
+ /*}}}*/
+
// AcquireStatus::pkgAcquireStatus - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-pkgAcquireStatus::pkgAcquireStatus() : d(NULL), Percent(0), Update(true), MorePulses(false)
+pkgAcquireStatus::pkgAcquireStatus() : d(NULL), Percent(-1), Update(true), MorePulses(false)
{
Start();
}
@@ -909,9 +1011,9 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner)
{
CurrentBytes += I->CurrentSize;
ResumeSize += I->ResumePoint;
-
+
// Files with unknown size always have 100% completion
- if (I->CurrentItem->Owner->FileSize == 0 &&
+ if (I->CurrentItem->Owner->FileSize == 0 &&
I->CurrentItem->Owner->Complete == false)
TotalBytes += I->CurrentSize;
}
@@ -952,13 +1054,17 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner)
Time = NewTime;
}
+ double const OldPercent = Percent;
// calculate the percentage, if we have too little data assume 1%
if (TotalBytes > 0 && UnfetchedReleaseFiles)
Percent = 0;
- else
+ else
// use both files and bytes because bytes can be unreliable
- Percent = (0.8 * (CurrentBytes/float(TotalBytes)*100.0) +
+ Percent = (0.8 * (CurrentBytes/float(TotalBytes)*100.0) +
0.2 * (CurrentItems/float(TotalItems)*100.0));
+ double const DiffPercent = Percent - OldPercent;
+ if (DiffPercent < 0.001 && _config->FindB("Acquire::Progress::Diffpercent", false) == true)
+ return true;
int fd = _config->FindI("APT::Status-Fd",-1);
if(fd > 0)
@@ -976,11 +1082,11 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner)
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
<< ":" << std::setprecision(3) << Percent
- << ":" << msg
+ << ":" << msg
<< endl;
std::string const dlstatus = status.str();
@@ -1037,6 +1143,15 @@ void pkgAcquireStatus::Fetched(unsigned long long Size,unsigned long long Resume
}
/*}}}*/
+pkgAcquire::UriIterator::UriIterator(pkgAcquire::Queue *Q) : d(NULL), CurQ(Q), CurItem(0)
+{
+ while (CurItem == 0 && CurQ != 0)
+ {
+ CurItem = CurQ->Items;
+ CurQ = CurQ->Next;
+ }
+}
+
APT_CONST pkgAcquire::UriIterator::~UriIterator() {}
APT_CONST pkgAcquire::MethodConfig::~MethodConfig() {}
APT_CONST pkgAcquireStatus::~pkgAcquireStatus() {}
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index f33362922..b7e6c68f1 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -1,6 +1,5 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: acquire.h,v 1.29.2.1 2003/12/24 23:09:17 mdz Exp $
/* ######################################################################
Acquire - File Acquiration
@@ -68,9 +67,10 @@
#include <apt-pkg/macros.h>
#include <apt-pkg/weakptr.h>
+#include <apt-pkg/hashes.h>
-#include <vector>
#include <string>
+#include <vector>
#include <stddef.h>
#include <sys/time.h>
@@ -111,6 +111,7 @@ class pkgAcquire
struct MethodConfig;
struct ItemDesc;
friend class Item;
+ friend class pkgAcqMetaBase;
friend class Queue;
typedef std::vector<Item *>::iterator ItemIterator;
@@ -389,13 +390,13 @@ class pkgAcquire
*/
struct pkgAcquire::ItemDesc : public WeakPointable
{
- /** \brief The URI from which to download this item. */
+ /** \brief URI from which to download this item. */
std::string URI;
- /** brief A description of this item. */
+ /** \brief description of this item. */
std::string Description;
- /** brief A shorter description of this item. */
+ /** \brief shorter description of this item. */
std::string ShortDesc;
- /** brief The underlying item which is to be downloaded. */
+ /** \brief underlying item which is to be downloaded. */
Item *Owner;
};
/*}}}*/
@@ -418,13 +419,26 @@ class pkgAcquire::Queue
protected:
/** \brief A single item placed in this queue. */
- struct QItem : pkgAcquire::ItemDesc
+ struct QItem : public WeakPointable
{
/** \brief The next item in the queue. */
QItem *Next;
/** \brief The worker associated with this item, if any. */
pkgAcquire::Worker *Worker;
+ /** \brief The URI from which to download this item. */
+ std::string URI;
+ /** \brief A description of this item. */
+ std::string Description;
+ /** \brief A shorter description of this item. */
+ std::string ShortDesc;
+ /** \brief The underlying items interested in the download */
+ std::vector<Item*> Owners;
+ // both, backward compatibility and easy access as syncing is interal
+ Item * Owner;
+
+ typedef std::vector<Item*>::const_iterator owner_iterator;
+
/** \brief Assign the ItemDesc portion of this QItem from
* another ItemDesc
*/
@@ -433,10 +447,24 @@ class pkgAcquire::Queue
URI = I.URI;
Description = I.Description;
ShortDesc = I.ShortDesc;
+ Owners.clear();
+ Owners.push_back(I.Owner);
Owner = I.Owner;
};
+
+ /** @return the sum of all expected hashes by all owners */
+ HashStringList GetExpectedHashes() const;
+
+ /** @return smallest maximum size of all owners */
+ unsigned long long GetMaximumSize() const;
+
+ /** \brief get partial files in order */
+ void SyncDestinationFiles() const;
+
+ /** @return the custom headers to use for this item */
+ std::string Custom600Headers() const;
};
-
+
/** \brief The name of this queue. */
std::string Name;
@@ -589,7 +617,7 @@ class pkgAcquire::UriIterator
}
};
- inline pkgAcquire::ItemDesc const *operator ->() const {return CurItem;};
+ inline pkgAcquire::Queue::QItem 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;};
@@ -597,14 +625,7 @@ class pkgAcquire::UriIterator
*
* \param Q The queue over which this UriIterator should iterate.
*/
- UriIterator(pkgAcquire::Queue *Q) : d(NULL), CurQ(Q), CurItem(0)
- {
- while (CurItem == 0 && CurQ != 0)
- {
- CurItem = CurQ->Items;
- CurQ = CurQ->Next;
- }
- }
+ UriIterator(pkgAcquire::Queue *Q);
virtual ~UriIterator();
};
/*}}}*/
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 71b5ac2c1..adbec82f7 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -468,7 +468,7 @@ void pkgProblemResolver::MakeScores()
if (D->Version != 0)
{
pkgCache::VerIterator const IV = Cache[T].InstVerIter(Cache);
- if (IV.end() == true || D.IsSatisfied(IV) != D.IsNegative())
+ if (IV.end() == true || D.IsSatisfied(IV) == false)
continue;
}
Scores[T->ID] += DepMap[D->Type];
@@ -640,6 +640,12 @@ bool pkgProblemResolver::DoUpgrade(pkgCache::PkgIterator Pkg)
// ProblemResolver::Resolve - calls a resolver to fix the situation /*{{{*/
// ---------------------------------------------------------------------
/* */
+#if APT_PKG_ABI < 413
+bool pkgProblemResolver::Resolve(bool BrokenFix)
+{
+ return Resolve(BrokenFix, NULL);
+}
+#endif
bool pkgProblemResolver::Resolve(bool BrokenFix, OpProgress * const Progress)
{
std::string const solver = _config->Find("APT::Solver", "internal");
@@ -1138,6 +1144,12 @@ bool pkgProblemResolver::InstOrNewPolicyBroken(pkgCache::PkgIterator I)
/* This is the work horse of the soft upgrade routine. It is very gental
in that it does not install or remove any packages. It is assumed that the
system was non-broken previously. */
+#if APT_PKG_ABI < 413
+bool pkgProblemResolver::ResolveByKeep()
+{
+ return ResolveByKeep(NULL);
+}
+#endif
bool pkgProblemResolver::ResolveByKeep(OpProgress * const Progress)
{
std::string const solver = _config->Find("APT::Solver", "internal");
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index b6da1f2bf..dab844220 100644
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -1,6 +1,5 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: algorithms.h,v 1.10 2001/05/22 04:17:41 jgg Exp $
/* ######################################################################
Algorithms - A set of misc algorithms
@@ -55,6 +54,7 @@ using std::ostream;
class pkgSimulate : public pkgPackageManager /*{{{*/
{
+ void *d;
protected:
class Policy : public pkgDepCache::Policy
@@ -88,7 +88,7 @@ private:
public:
pkgSimulate(pkgDepCache *Cache);
- ~pkgSimulate();
+ virtual ~pkgSimulate();
};
/*}}}*/
class pkgProblemResolver /*{{{*/
@@ -138,15 +138,25 @@ class pkgProblemResolver /*{{{*/
inline void Clear(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] &= ~(Protected | ToRemove);};
// Try to intelligently resolve problems by installing and removing packages
+#if APT_PKG_ABI >= 413
bool Resolve(bool BrokenFix = false, OpProgress * const Progress = NULL);
+#else
+ bool Resolve(bool BrokenFix = false);
+ bool Resolve(bool BrokenFix, OpProgress * const Progress);
+#endif
// Try to resolve problems only by using keep
+#if APT_PKG_ABI >= 413
bool ResolveByKeep(OpProgress * const Progress = NULL);
+#else
+ bool ResolveByKeep();
+ bool ResolveByKeep(OpProgress * const Progress);
+#endif
APT_DEPRECATED void InstallProtect();
pkgProblemResolver(pkgDepCache *Cache);
- ~pkgProblemResolver();
+ virtual ~pkgProblemResolver();
};
/*}}}*/
bool pkgApplyStatus(pkgDepCache &Cache);
diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h
index c7b8d2d73..353843c3e 100644
--- a/apt-pkg/aptconfiguration.h
+++ b/apt-pkg/aptconfiguration.h
@@ -16,8 +16,7 @@
#include <limits>
/*}}}*/
namespace APT {
-class Configuration { /*{{{*/
-public: /*{{{*/
+namespace Configuration { /*{{{*/
/** \brief Returns a vector of usable Compression Types
*
* Files can be compressed in various ways to decrease the size of the
@@ -39,7 +38,7 @@ public: /*{{{*/
*
* \return a vector of the compression types in the preferred usage order
*/
- std::vector<std::string> static const getCompressionTypes(bool const &Cached = true);
+ std::vector<std::string> const getCompressionTypes(bool const &Cached = true);
/** \brief Returns a vector of Language Codes
*
@@ -64,7 +63,7 @@ public: /*{{{*/
*
* \return a vector of (all) Language Codes in the preferred usage order
*/
- std::vector<std::string> static const getLanguages(bool const &All = false,
+ std::vector<std::string> const getLanguages(bool const &All = false,
bool const &Cached = true, char const ** const Locale = 0);
/** \brief Are we interested in the given Language?
@@ -73,7 +72,7 @@ public: /*{{{*/
* \param All defines if we check against all codes or only against used codes
* \return true if we are interested, false otherwise
*/
- bool static checkLanguage(std::string Lang, bool const All = false);
+ bool checkLanguage(std::string Lang, bool const All = false);
/** \brief Returns a vector of Architectures we support
*
@@ -82,14 +81,14 @@ public: /*{{{*/
*
* \return a vector of Architectures in preferred order
*/
- std::vector<std::string> static const getArchitectures(bool const &Cached = true);
+ std::vector<std::string> const getArchitectures(bool const &Cached = true);
/** \brief Are we interested in the given Architecture?
*
* \param Arch we want to check
* \return true if we are interested, false otherwise
*/
- bool static checkArchitecture(std::string const &Arch);
+ bool checkArchitecture(std::string const &Arch);
/** \brief Representation of supported compressors */
struct Compressor {
@@ -113,15 +112,15 @@ public: /*{{{*/
*
* \return a vector of Compressors
*/
- std::vector<Compressor> static const getCompressors(bool const Cached = true);
+ std::vector<Compressor> const getCompressors(bool const Cached = true);
/** \brief Return a vector of extensions supported for data.tar's */
- std::vector<std::string> static const getCompressorExtensions();
+ std::vector<std::string> const getCompressorExtensions();
/** \return Return a vector of enabled build profile specifications */
- std::vector<std::string> static const getBuildProfiles();
+ std::vector<std::string> const getBuildProfiles();
/** \return Return a comma-separated list of enabled build profile specifications */
- std::string static const getBuildProfilesString();
+ std::string const getBuildProfilesString();
/*}}}*/
};
/*}}}*/
diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h
index 36b20893a..74a092593 100644
--- a/apt-pkg/cachefile.h
+++ b/apt-pkg/cachefile.h
@@ -1,6 +1,5 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: cachefile.h,v 1.5 2002/04/27 04:28:04 jgg Exp $
/* ######################################################################
CacheFile - Simple wrapper class for opening, generating and whatnot
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index b0c02d4a2..301da6fc4 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -161,10 +161,12 @@ class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> {
// Accessors
inline const char *Name() const { return Group().Name(); }
// Versions have sections - and packages can have different versions with different sections
- // so this interface is broken by design. It used to return the section of the "first parsed
- // package stanza", but as this can potentially be anything it now returns the section of the
- // newest version instead (if any). aka: Run as fast as you can to Version.Section().
- APT_DEPRECATED const char *Section() const;
+ // so this interface is broken by design. Run as fast as you can to Version.Section().
+ APT_DEPRECATED inline const char *Section() const {
+ APT_IGNORE_DEPRECATED_PUSH
+ return S->Section == 0?0:Owner->StrP + S->Section;
+ APT_IGNORE_DEPRECATED_POP
+ }
inline bool Purge() const {return S->CurrentState == pkgCache::State::Purge ||
(S->CurrentVer == 0 && S->CurrentState == pkgCache::State::NotInstalled);}
inline const char *Arch() const {return S->Arch == 0?0:Owner->StrP + S->Arch;}
@@ -215,12 +217,14 @@ class pkgCache::VerIterator : public Iterator<Version, VerIterator> {
// Accessors
inline const char *VerStr() const {return S->VerStr == 0?0:Owner->StrP + S->VerStr;}
inline const char *Section() const {return S->Section == 0?0:Owner->StrP + S->Section;}
+#if APT_PKG_ABI >= 413
/** \brief source package name this version comes from
Always contains the name, even if it is the same as the binary name */
inline const char *SourcePkgName() const {return Owner->StrP + S->SourcePkgName;}
/** \brief source version this version comes from
Always contains the version string, even if it is the same as the binary version */
inline const char *SourceVerStr() const {return Owner->StrP + S->SourceVerStr;}
+#endif
inline const char *Arch() const {
if ((S->MultiArch & pkgCache::Version::All) == pkgCache::Version::All)
return "all";
@@ -363,27 +367,61 @@ class pkgCache::PrvIterator : public Iterator<Provides, PrvIterator> {
}
};
/*}}}*/
-// Package file /*{{{*/
-class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator> {
+// Release file /*{{{*/
+class pkgCache::RlsFileIterator : public Iterator<ReleaseFile, RlsFileIterator> {
protected:
- inline PackageFile* OwnerPointer() const {
- return (Owner != 0) ? Owner->PkgFileP : 0;
+ inline ReleaseFile* OwnerPointer() const {
+ return (Owner != 0) ? Owner->RlsFileP : 0;
}
public:
// Iteration
- void operator ++(int) {if (S != Owner->PkgFileP) S = Owner->PkgFileP + S->NextFile;}
+ void operator ++(int) {if (S != Owner->RlsFileP) S = Owner->RlsFileP + S->NextFile;}
inline void operator ++() {operator ++(0);}
// Accessors
inline const char *FileName() const {return S->FileName == 0?0:Owner->StrP + S->FileName;}
inline const char *Archive() const {return S->Archive == 0?0:Owner->StrP + S->Archive;}
- inline const char *Component() const {return S->Component == 0?0:Owner->StrP + S->Component;}
inline const char *Version() const {return S->Version == 0?0:Owner->StrP + S->Version;}
inline const char *Origin() const {return S->Origin == 0?0:Owner->StrP + S->Origin;}
inline const char *Codename() const {return S->Codename ==0?0:Owner->StrP + S->Codename;}
inline const char *Label() const {return S->Label == 0?0:Owner->StrP + S->Label;}
inline const char *Site() const {return S->Site == 0?0:Owner->StrP + S->Site;}
+ inline bool Flagged(pkgCache::Flag::ReleaseFileFlags const flag) const {return (S->Flags & flag) == flag; }
+
+ bool IsOk();
+ std::string RelStr();
+
+ // Constructors
+ inline RlsFileIterator() : Iterator<ReleaseFile, RlsFileIterator>() {}
+ inline RlsFileIterator(pkgCache &Owner) : Iterator<ReleaseFile, RlsFileIterator>(Owner, Owner.RlsFileP) {}
+ inline RlsFileIterator(pkgCache &Owner,ReleaseFile *Trg) : Iterator<ReleaseFile, RlsFileIterator>(Owner, Trg) {}
+};
+ /*}}}*/
+// Package file /*{{{*/
+class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator> {
+ protected:
+ inline PackageFile* OwnerPointer() const {
+ return (Owner != 0) ? Owner->PkgFileP : 0;
+ }
+
+ public:
+ // Iteration
+ void operator ++(int) {if (S != Owner->PkgFileP) S = Owner->PkgFileP + S->NextFile;}
+ inline void operator ++() {operator ++(0);}
+
+ // Accessors
+ inline const char *FileName() const {return S->FileName == 0?0:Owner->StrP + S->FileName;}
+ inline pkgCache::RlsFileIterator ReleaseFile() const {return RlsFileIterator(*Owner, Owner->RlsFileP + S->Release);}
+ inline const char *Archive() const {return S->Release == 0 ? Component() : ReleaseFile().Archive();}
+ inline const char *Version() const {return S->Release == 0 ? NULL : ReleaseFile().Version();}
+ inline const char *Origin() const {return S->Release == 0 ? NULL : ReleaseFile().Origin();}
+ inline const char *Codename() const {return S->Release == 0 ? NULL : ReleaseFile().Codename();}
+ inline const char *Label() const {return S->Release == 0 ? NULL : ReleaseFile().Label();}
+ inline const char *Site() const {return S->Release == 0 ? NULL : ReleaseFile().Site();}
+ inline bool Flagged(pkgCache::Flag::ReleaseFileFlags const flag) const {return S->Release== 0 ? false : ReleaseFile().Flagged(flag);}
+ inline bool Flagged(pkgCache::Flag::PkgFFlags const flag) const {return (S->Flags & flag) == flag;}
+ inline const char *Component() const {return S->Component == 0?0:Owner->StrP + S->Component;}
inline const char *Architecture() const {return S->Architecture == 0?0:Owner->StrP + S->Architecture;}
inline const char *IndexType() const {return S->IndexType == 0?0:Owner->StrP + S->IndexType;}
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index 76a7e717e..c42f76112 100644
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -37,7 +37,6 @@
#include <apti18n.h>
/*}}}*/
namespace APT {
-
// PackageFrom - selecting the appropriate method for package selection /*{{{*/
bool CacheSetHelper::PackageFrom(enum PkgSelector const select, PackageContainerInterface * const pci,
pkgCacheFile &Cache, std::string const &pattern) {
@@ -613,19 +612,14 @@ void CacheSetHelper::canNotFindPackage(enum PkgSelector const select,
PackageContainerInterface * const pci, pkgCacheFile &Cache,
std::string const &pattern) {
switch (select) {
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
case REGEX: canNotFindRegEx(pci, Cache, pattern); break;
case TASK: canNotFindTask(pci, Cache, pattern); break;
case FNMATCH: canNotFindFnmatch(pci, Cache, pattern); break;
case PACKAGENAME: canNotFindPackage(pci, Cache, pattern); break;
case STRING: canNotFindPackage(pci, Cache, pattern); break;
case UNKNOWN: break;
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
}
}
// canNotFindTask - handle the case no package is found for a task /*{{{*/
@@ -663,19 +657,14 @@ pkgCache::PkgIterator CacheSetHelper::canNotFindPkgName(pkgCacheFile &Cache,
void CacheSetHelper::canNotFindVersion(enum VerSelector const select, VersionContainerInterface * const vci, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg)
{
switch (select) {
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
case ALL: canNotFindAllVer(vci, Cache, Pkg); break;
case INSTCAND: canNotFindInstCandVer(vci, Cache, Pkg); break;
case CANDINST: canNotFindCandInstVer(vci, Cache, Pkg); break;
case NEWEST: canNotFindNewestVer(Cache, Pkg); break;
case CANDIDATE: canNotFindCandidateVer(Cache, Pkg); break;
case INSTALLED: canNotFindInstalledVer(Cache, Pkg); break;
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
case CANDANDINST: canNotGetCandInstVer(Cache, Pkg); break;
case RELEASE:
case VERSIONNUMBER:
@@ -706,16 +695,11 @@ void CacheSetHelper::canNotFindCandInstVer(VersionContainerInterface * const /*v
// canNotGetVersion - for package by selector /*{{{*/
pkgCache::VerIterator CacheSetHelper::canNotGetVersion(enum VerSelector const select, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) {
switch (select) {
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
case NEWEST: return canNotFindNewestVer(Cache, Pkg);
case CANDIDATE: return canNotFindCandidateVer(Cache, Pkg);
case INSTALLED: return canNotFindInstalledVer(Cache, Pkg);
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
case CANDINST: return canNotGetCandInstVer(Cache, Pkg);
case INSTCAND: return canNotGetInstCandVer(Cache, Pkg);
case ALL:
@@ -769,19 +753,14 @@ pkgCache::VerIterator CacheSetHelper::canNotGetCandInstVer(pkgCacheFile &Cache,
/*}}}*/
/*}}}*/
// showPackageSelection - by selector and given pattern /*{{{*/
-APT_CONST void CacheSetHelper::showPackageSelection(pkgCache::PkgIterator const &pkg, enum PkgSelector const select,
+void CacheSetHelper::showPackageSelection(pkgCache::PkgIterator const &pkg, enum PkgSelector const select,
std::string const &pattern) {
switch (select) {
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
case REGEX: showRegExSelection(pkg, pattern); break;
case TASK: showTaskSelection(pkg, pattern); break;
case FNMATCH: showFnmatchSelection(pkg, pattern); break;
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
case PACKAGENAME: /* no suprises here */ break;
case STRING: /* handled by the special cases */ break;
case UNKNOWN: break;
@@ -804,23 +783,17 @@ APT_CONST void CacheSetHelper::showFnmatchSelection(pkgCache::PkgIterator const
/*}}}*/
/*}}}*/
// showVersionSelection /*{{{*/
-APT_CONST void CacheSetHelper::showVersionSelection(pkgCache::PkgIterator const &Pkg,
+void CacheSetHelper::showVersionSelection(pkgCache::PkgIterator const &Pkg,
pkgCache::VerIterator const &Ver, enum VerSelector const select, std::string const &pattern) {
switch (select) {
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
case RELEASE:
showSelectedVersion(Pkg, Ver, pattern, true);
break;
case VERSIONNUMBER:
showSelectedVersion(Pkg, Ver, pattern, false);
break;
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_POP
case NEWEST:
case CANDIDATE:
case INSTALLED:
@@ -838,4 +811,18 @@ APT_CONST void CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const &
bool const /*verIsRel*/) {
}
/*}}}*/
+
+CacheSetHelper::CacheSetHelper(bool const ShowError, GlobalError::MsgType ErrorType) :
+ ShowError(ShowError), ErrorType(ErrorType) {}
+CacheSetHelper::~CacheSetHelper() {}
+
+PackageContainerInterface::PackageContainerInterface() : ConstructedBy(CacheSetHelper::UNKNOWN) {}
+PackageContainerInterface::PackageContainerInterface(CacheSetHelper::PkgSelector const by) : ConstructedBy(by) {}
+PackageContainerInterface::~PackageContainerInterface() {}
+
+PackageUniverse::PackageUniverse(pkgCache * const Owner) : _cont(Owner) { }
+PackageUniverse::~PackageUniverse() {}
+
+VersionContainerInterface::VersionContainerInterface() {}
+VersionContainerInterface::~VersionContainerInterface() {}
}
diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h
index f3f1d1fc6..1a6feb5f7 100644
--- a/apt-pkg/cacheset.h
+++ b/apt-pkg/cacheset.h
@@ -23,6 +23,7 @@
#include <apt-pkg/error.h>
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/macros.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/cachefile.h>
@@ -49,9 +50,8 @@ class CacheSetHelper { /*{{{*/
*/
public: /*{{{*/
CacheSetHelper(bool const ShowError = true,
- GlobalError::MsgType ErrorType = GlobalError::ERROR) :
- ShowError(ShowError), ErrorType(ErrorType) {}
- virtual ~CacheSetHelper() {}
+ GlobalError::MsgType ErrorType = GlobalError::ERROR);
+ virtual ~CacheSetHelper();
enum PkgSelector { UNKNOWN, REGEX, TASK, FNMATCH, PACKAGENAME, STRING };
@@ -202,6 +202,8 @@ protected:
bool PackageFromFnmatch(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern);
bool PackageFromPackageName(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern);
bool PackageFromString(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &pattern);
+private:
+ void *d;
}; /*}}}*/
class PackageContainerInterface { /*{{{*/
@@ -224,14 +226,9 @@ public:
inline std::string FullName(bool const Pretty) const { return getPkg().FullName(Pretty); }
inline std::string FullName() const { return getPkg().FullName(); }
APT_DEPRECATED inline const char *Section() const {
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
- return getPkg().Section();
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+ APT_IGNORE_DEPRECATED_PUSH
+ return getPkg().Section();
+ APT_IGNORE_DEPRECATED_POP
}
inline bool Purge() const {return getPkg().Purge(); }
inline const char *Arch() const {return getPkg().Arch(); }
@@ -261,19 +258,15 @@ public:
REGEX = CacheSetHelper::REGEX,
TASK = CacheSetHelper::TASK,
FNMATCH = CacheSetHelper::FNMATCH };
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
void setConstructor(Constructor const by) { ConstructedBy = (CacheSetHelper::PkgSelector)by; }
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
void setConstructor(CacheSetHelper::PkgSelector const by) { ConstructedBy = by; }
CacheSetHelper::PkgSelector getConstructor() const { return ConstructedBy; }
- PackageContainerInterface() : ConstructedBy(CacheSetHelper::UNKNOWN) {}
- PackageContainerInterface(CacheSetHelper::PkgSelector const by) : ConstructedBy(by) {}
+ PackageContainerInterface();
+ PackageContainerInterface(CacheSetHelper::PkgSelector const by);
+ virtual ~PackageContainerInterface();
APT_DEPRECATED static bool FromTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) {
return helper.PackageFrom(CacheSetHelper::TASK, pci, Cache, pattern); }
@@ -290,22 +283,18 @@ public:
APT_DEPRECATED typedef CacheSetHelper::PkgModifier Modifier;
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
APT_DEPRECATED static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &pattern, CacheSetHelper &helper) {
return helper.PackageFromName(Cache, pattern); }
APT_DEPRECATED static bool FromModifierCommandLine(unsigned short &modID, PackageContainerInterface * const pci,
pkgCacheFile &Cache, const char * cmdline,
std::list<Modifier> const &mods, CacheSetHelper &helper) {
return helper.PackageFromModifierCommandLine(modID, pci, Cache, cmdline, mods); }
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
private:
CacheSetHelper::PkgSelector ConstructedBy;
+ void *d;
};
/*}}}*/
template<class Container> class PackageContainer : public PackageContainerInterface {/*{{{*/
@@ -369,16 +358,11 @@ public: /*{{{*/
iterator end() { return iterator(_cont.end()); }
const_iterator find(pkgCache::PkgIterator const &P) const { return const_iterator(_cont.find(P)); }
- PackageContainer() : PackageContainerInterface() {}
+ PackageContainer() : PackageContainerInterface(CacheSetHelper::UNKNOWN) {}
PackageContainer(CacheSetHelper::PkgSelector const &by) : PackageContainerInterface(by) {}
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
APT_DEPRECATED PackageContainer(Constructor const &by) : PackageContainerInterface((CacheSetHelper::PkgSelector)by) {}
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
/** \brief sort all included versions with given comparer
@@ -439,10 +423,7 @@ public: /*{{{*/
return FromFnmatch(Cache, pattern, helper);
}
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
/** \brief returns a package specified by a string
\param Cache the package is in
@@ -455,9 +436,7 @@ public: /*{{{*/
CacheSetHelper helper;
return FromName(Cache, pattern, helper);
}
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
/** \brief returns all packages specified by a string
@@ -576,6 +555,7 @@ template<> template<class Compare> inline bool PackageContainer<std::vector<pkgC
private methods. */
class APT_HIDDEN PackageUniverse : public PackageContainerInterface {
pkgCache * const _cont;
+ void *d;
public:
typedef pkgCache::PkgIterator iterator;
typedef pkgCache::PkgIterator const_iterator;
@@ -588,7 +568,8 @@ public:
APT_PUBLIC iterator begin() { return _cont->PkgBegin(); }
APT_PUBLIC iterator end() { return _cont->PkgEnd(); }
- APT_PUBLIC PackageUniverse(pkgCache * const Owner) : _cont(Owner) { }
+ APT_PUBLIC PackageUniverse(pkgCache * const Owner);
+ APT_PUBLIC virtual ~PackageUniverse();
private:
bool insert(pkgCache::PkgIterator const &) { return true; }
@@ -663,65 +644,45 @@ public:
Modifier (unsigned short const &id, const char * const alias, Position const &pos,
enum CacheSetHelper::VerSelector const select) : ID(id), Alias(alias), Pos(pos),
SelectVersion(select) {}
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
APT_DEPRECATED Modifier(unsigned short const &id, const char * const alias, Position const &pos,
Version const &select) : ID(id), Alias(alias), Pos(pos),
SelectVersion((CacheSetHelper::VerSelector)select) {}
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
};
static bool FromCommandLine(VersionContainerInterface * const vci, pkgCacheFile &Cache,
const char **cmdline, CacheSetHelper::VerSelector const fallback,
CacheSetHelper &helper);
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
APT_DEPRECATED static bool FromCommandLine(VersionContainerInterface * const vci, pkgCacheFile &Cache,
const char **cmdline, Version const &fallback,
CacheSetHelper &helper) {
return FromCommandLine(vci, Cache, cmdline, (CacheSetHelper::VerSelector)fallback, helper);
}
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
static bool FromString(VersionContainerInterface * const vci, pkgCacheFile &Cache,
std::string pkg, CacheSetHelper::VerSelector const fallback, CacheSetHelper &helper,
bool const onlyFromName = false);
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
APT_DEPRECATED static bool FromString(VersionContainerInterface * const vci, pkgCacheFile &Cache,
std::string pkg, Version const &fallback, CacheSetHelper &helper,
bool const onlyFromName = false) {
return FromString(vci, Cache, pkg, (CacheSetHelper::VerSelector)fallback, helper, onlyFromName);
}
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
static bool FromPackage(VersionContainerInterface * const vci, pkgCacheFile &Cache,
pkgCache::PkgIterator const &P, CacheSetHelper::VerSelector const fallback,
CacheSetHelper &helper);
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
APT_DEPRECATED static bool FromPackage(VersionContainerInterface * const vci, pkgCacheFile &Cache,
pkgCache::PkgIterator const &P, Version const &fallback,
CacheSetHelper &helper) {
return FromPackage(vci, Cache, P, (CacheSetHelper::VerSelector)fallback, helper);
}
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
static bool FromModifierCommandLine(unsigned short &modID,
VersionContainerInterface * const vci,
@@ -735,10 +696,7 @@ public:
pkgCache::DepIterator const &D,
CacheSetHelper::VerSelector const selector,
CacheSetHelper &helper);
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
APT_DEPRECATED static bool FromDependency(VersionContainerInterface * const vci,
pkgCacheFile &Cache,
pkgCache::DepIterator const &D,
@@ -746,9 +704,12 @@ public:
CacheSetHelper &helper) {
return FromDependency(vci, Cache, D, (CacheSetHelper::VerSelector)selector, helper);
}
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
+
+ VersionContainerInterface();
+ virtual ~VersionContainerInterface();
+private:
+ void *d;
protected: /*{{{*/
@@ -879,10 +840,7 @@ public: /*{{{*/
static VersionContainer FromString(pkgCacheFile &Cache, std::string pkg) {
return FromString(Cache, pkg, CacheSetHelper::CANDINST);
}
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
static VersionContainer FromCommandLine(pkgCacheFile &Cache, const char **cmdline,
Version const &fallback, CacheSetHelper &helper) {
VersionContainer vercon;
@@ -906,9 +864,7 @@ public: /*{{{*/
CacheSetHelper helper;
return FromString(Cache, pkg, (CacheSetHelper::VerSelector)fallback, helper);
}
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
/** \brief returns all versions specified for the package
@@ -927,10 +883,7 @@ public: /*{{{*/
CacheSetHelper helper;
return FromPackage(Cache, P, fallback, helper);
}
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
static VersionContainer FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P,
Version const &fallback, CacheSetHelper &helper) {
VersionContainer vercon;
@@ -942,9 +895,7 @@ public: /*{{{*/
CacheSetHelper helper;
return FromPackage(Cache, P, (CacheSetHelper::VerSelector)fallback, helper);
}
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
static VersionContainer FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P) {
return FromPackage(Cache, P, CacheSetHelper::CANDIDATE);
}
@@ -985,10 +936,7 @@ public: /*{{{*/
CacheSetHelper helper;
return FromPackage(Cache, D, selector, helper);
}
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
static VersionContainer FromDependency(pkgCacheFile &Cache, pkgCache::DepIterator const &D,
Version const &selector, CacheSetHelper &helper) {
VersionContainer vercon;
@@ -1000,9 +948,7 @@ public: /*{{{*/
CacheSetHelper helper;
return FromPackage(Cache, D, (CacheSetHelper::VerSelector)selector, helper);
}
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
static VersionContainer FromDependency(pkgCacheFile &Cache, pkgCache::DepIterator const &D) {
return FromPackage(Cache, D, CacheSetHelper::CANDIDATE);
}
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index b97f7b036..de5cd0657 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -466,7 +466,7 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
// Open the stream for reading
ifstream F((FileExists(File)?File.c_str():"/dev/null"),
ios::in );
- if (!F != 0)
+ if (F.fail() == true)
return _error->Errno("ifstream::ifstream","Opening %s",File.c_str());
string NewFile = File + ".new";
@@ -477,7 +477,7 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
"Failed to open %s.new",File.c_str());
// Create a short uri without the path
- string ShortURI = "cdrom:[" + Name + "]/";
+ string ShortURI = "cdrom:[" + Name + "]/";
string ShortURI2 = "cdrom:" + Name + "/"; // For Compatibility
string Type;
@@ -485,12 +485,12 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
Type = "deb-src";
else
Type = "deb";
-
+
char Buffer[300];
int CurLine = 0;
bool First = true;
while (F.eof() == false)
- {
+ {
F.getline(Buffer,sizeof(Buffer));
CurLine++;
if (F.fail() && !F.eof())
@@ -754,7 +754,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/
FileExists(InfoDir + "/info") == true)
{
ifstream F((InfoDir + "/info").c_str());
- if (!F == 0)
+ if (F.good() == true)
getline(F,Name);
if (Name.empty() == false)
@@ -822,8 +822,11 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/
// check for existence and possibly create state directory for copying
string const listDir = _config->FindDir("Dir::State::lists");
string const partialListDir = listDir + "partial/";
- if (CreateAPTDirectoryIfNeeded(_config->FindDir("Dir::State"), partialListDir) == false &&
- CreateAPTDirectoryIfNeeded(listDir, partialListDir) == false)
+ mode_t const mode = umask(S_IWGRP | S_IWOTH);
+ bool const creation_fail = (CreateAPTDirectoryIfNeeded(_config->FindDir("Dir::State"), partialListDir) == false &&
+ CreateAPTDirectoryIfNeeded(listDir, partialListDir) == false);
+ umask(mode);
+ if (creation_fail == true)
{
UnmountCDROM(CDROM, NULL);
return _error->Errno("cdrom", _("List directory %spartial is missing."), listDir.c_str());
@@ -924,8 +927,7 @@ pkgUdevCdromDevices::pkgUdevCdromDevices() /*{{{*/
}
/*}}}*/
-bool
-pkgUdevCdromDevices::Dlopen() /*{{{*/
+bool pkgUdevCdromDevices::Dlopen() /*{{{*/
{
// alread open
if(libudev_handle != NULL)
@@ -954,18 +956,14 @@ pkgUdevCdromDevices::Dlopen() /*{{{*/
return true;
}
/*}}}*/
- /*{{{*/
-// convenience interface, this will just call ScanForRemovable
-vector<CdromDevice>
-pkgUdevCdromDevices::Scan()
+// convenience interface, this will just call ScanForRemovable /*{{{*/
+vector<CdromDevice> pkgUdevCdromDevices::Scan()
{
bool CdromOnly = _config->FindB("APT::cdrom::CdromOnly", true);
return ScanForRemovable(CdromOnly);
}
/*}}}*/
- /*{{{*/
-vector<CdromDevice>
-pkgUdevCdromDevices::ScanForRemovable(bool CdromOnly)
+vector<CdromDevice> pkgUdevCdromDevices::ScanForRemovable(bool CdromOnly)/*{{{*/
{
vector<CdromDevice> cdrom_devices;
struct udev_enumerate *enumerate;
@@ -1024,3 +1022,9 @@ pkgUdevCdromDevices::~pkgUdevCdromDevices() /*{{{*/
dlclose(libudev_handle);
}
/*}}}*/
+
+pkgCdromStatus::pkgCdromStatus() : totalSteps(0) {}
+pkgCdromStatus::~pkgCdromStatus() {}
+
+pkgCdrom::pkgCdrom() {}
+pkgCdrom::~pkgCdrom() {}
diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index bd0902176..5626b5059 100644
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -18,12 +18,13 @@ class OpProgress;
class pkgCdromStatus /*{{{*/
{
+ void *d;
protected:
int totalSteps;
public:
- pkgCdromStatus() : totalSteps(0) {};
- virtual ~pkgCdromStatus() {};
+ pkgCdromStatus();
+ virtual ~pkgCdromStatus();
// total steps
virtual void SetTotal(int total) { totalSteps = total; };
@@ -74,7 +75,12 @@ class pkgCdrom /*{{{*/
bool Ident(std::string &ident, pkgCdromStatus *log);
bool Add(pkgCdromStatus *log);
+ pkgCdrom();
+ virtual ~pkgCdrom();
+
private:
+ void *d;
+
APT_HIDDEN bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM,
std::string &ident, pkgCdromStatus * const log, bool const interactive);
APT_HIDDEN bool UnmountCDROM(std::string const &CDROM, pkgCdromStatus * const log);
@@ -92,6 +98,7 @@ struct CdromDevice /*{{{*/
/*}}}*/
class pkgUdevCdromDevices /*{{{*/
{
+ void *d;
protected:
// libudev dlopen structure
void *libudev_handle;
diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc
index 6edce5b6d..d05ae83b9 100644
--- a/apt-pkg/clean.cc
+++ b/apt-pkg/clean.cc
@@ -106,7 +106,7 @@ bool pkgArchiveCleaner::Go(std::string Dir,pkgCache &Cache)
J.end() == false; ++J)
{
if (CleanInstalled == true &&
- (J.File()->Flags & pkgCache::Flag::NotSource) != 0)
+ J.File().Flagged(pkgCache::Flag::NotSource))
continue;
IsFetchable = true;
break;
@@ -132,4 +132,5 @@ bool pkgArchiveCleaner::Go(std::string Dir,pkgCache &Cache)
}
/*}}}*/
+pkgArchiveCleaner::pkgArchiveCleaner() {}
APT_CONST pkgArchiveCleaner::~pkgArchiveCleaner() {}
diff --git a/apt-pkg/clean.h b/apt-pkg/clean.h
index 466cb67a9..a1495702b 100644
--- a/apt-pkg/clean.h
+++ b/apt-pkg/clean.h
@@ -30,6 +30,8 @@ class pkgArchiveCleaner
public:
bool Go(std::string Dir,pkgCache &Cache);
+
+ pkgArchiveCleaner();
virtual ~pkgArchiveCleaner();
};
diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc
index 936e377fb..6eb917457 100644
--- a/apt-pkg/contrib/cdromutl.cc
+++ b/apt-pkg/contrib/cdromutl.cc
@@ -207,7 +207,6 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version)
/* Run over the directory, we assume that the reader order will never
change as the media is read-only. In theory if the kernel did
some sort of wacked caching this might not be true.. */
- char S[300];
for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
{
// Skip some files..
@@ -215,30 +214,32 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version)
strcmp(Dir->d_name,"..") == 0)
continue;
+ std::string S;
if (Version <= 1)
{
- sprintf(S,"%lu",(unsigned long)Dir->d_ino);
+ strprintf(S, "%lu", (unsigned long)Dir->d_ino);
}
else
{
struct stat Buf;
if (stat(Dir->d_name,&Buf) != 0)
continue;
- sprintf(S,"%lu",(unsigned long)Buf.st_mtime);
+ strprintf(S, "%lu", (unsigned long)Buf.st_mtime);
}
-
- Hash.Add(S);
+
+ Hash.Add(S.c_str());
Hash.Add(Dir->d_name);
};
-
+
if (chdir(StartDir.c_str()) != 0) {
_error->Errno("chdir",_("Unable to change to %s"),StartDir.c_str());
closedir(D);
return false;
}
closedir(D);
-
+
// Some stats from the fsys
+ std::string S;
if (_config->FindB("Debug::identcdrom",false) == false)
{
struct statvfs Buf;
@@ -248,19 +249,19 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version)
// We use a kilobyte block size to advoid overflow
if (writable_media)
{
- sprintf(S,"%lu",(long)(Buf.f_blocks*(Buf.f_bsize/1024)));
+ strprintf(S, "%lu", (unsigned long)(Buf.f_blocks*(Buf.f_bsize/1024)));
} else {
- sprintf(S,"%lu %lu",(long)(Buf.f_blocks*(Buf.f_bsize/1024)),
- (long)(Buf.f_bfree*(Buf.f_bsize/1024)));
+ strprintf(S, "%lu %lu", (unsigned long)(Buf.f_blocks*(Buf.f_bsize/1024)),
+ (unsigned long)(Buf.f_bfree*(Buf.f_bsize/1024)));
}
- Hash.Add(S);
- sprintf(S,"-%u",Version);
+ Hash.Add(S.c_str());
+ strprintf(S, "-%u", Version);
}
else
- sprintf(S,"-%u.debug",Version);
-
+ strprintf(S, "-%u.debug", Version);
+
Res = Hash.Result().Value() + S;
- return true;
+ return true;
}
/*}}}*/
// FindMountPointForDevice - Find mountpoint for the given device /*{{{*/
diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc
index 93c1f4664..ff8b09ebc 100644
--- a/apt-pkg/contrib/cmndline.cc
+++ b/apt-pkg/contrib/cmndline.cc
@@ -34,6 +34,9 @@ CommandLine::CommandLine(Args *AList,Configuration *Conf) : ArgList(AList),
Conf(Conf), FileList(0)
{
}
+CommandLine::CommandLine() : ArgList(NULL), Conf(NULL), FileList(0)
+{
+}
/*}}}*/
// CommandLine::~CommandLine - Destructor /*{{{*/
// ---------------------------------------------------------------------
diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h
index 143df58b2..58cbaa8c3 100644
--- a/apt-pkg/contrib/cmndline.h
+++ b/apt-pkg/contrib/cmndline.h
@@ -91,6 +91,7 @@ class CommandLine
static CommandLine::Args MakeArgs(char ShortOpt, char const *LongOpt,
char const *ConfName, unsigned long Flags) APT_CONST;
+ CommandLine();
CommandLine(Args *AList,Configuration *Conf);
~CommandLine();
};
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 4380d64b9..2500ab631 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -253,7 +253,13 @@ string Configuration::FindDir(const char *Name,const char *Default) const
// Configuration::FindVector - Find a vector of values /*{{{*/
// ---------------------------------------------------------------------
/* Returns a vector of config values under the given item */
-vector<string> Configuration::FindVector(const char *Name, std::string const &Default) const
+#if APT_PKG_ABI < 413
+vector<string> Configuration::FindVector(const char *Name) const
+{
+ return FindVector(Name, "");
+}
+#endif
+vector<string> Configuration::FindVector(const char *Name, std::string const &Default, bool const Keys) const
{
vector<string> Vec;
const Item *Top = Lookup(Name);
@@ -266,7 +272,7 @@ vector<string> Configuration::FindVector(const char *Name, std::string const &De
Item *I = Top->Child;
while(I != NULL)
{
- Vec.push_back(I->Value);
+ Vec.push_back(Keys ? I->Tag : I->Value);
I = I->Next;
}
if (Vec.empty() == true)
@@ -623,19 +629,19 @@ string Configuration::Item::FullTag(const Item *Stop) const
tag/value. AsSectional enables Sectional parsing.*/
bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectional,
unsigned const &Depth)
-{
+{
// Open the stream for reading
- ifstream F(FName.c_str(),ios::in);
- if (!F != 0)
+ ifstream F(FName.c_str(),ios::in);
+ if (F.fail() == true)
return _error->Errno("ifstream::ifstream",_("Opening configuration file %s"),FName.c_str());
string LineBuffer;
string Stack[100];
unsigned int StackPos = 0;
-
+
// Parser state
string ParentTag;
-
+
int CurLine = 0;
bool InComment = false;
while (F.eof() == false)
diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 2ecea8bee..eacc26fda 100644
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -84,8 +84,9 @@ class Configuration
*
* \param Name of the parent node
* \param Default list of values separated by commas */
- std::vector<std::string> FindVector(const char *Name, std::string const &Default = "") const;
- std::vector<std::string> FindVector(std::string const &Name, std::string const &Default = "") const { return FindVector(Name.c_str(), Default); };
+ std::vector<std::string> FindVector(const char *Name, std::string const &Default = "", bool const Keys = false) const;
+ std::vector<std::string> FindVector(std::string const &Name, std::string const &Default = "", bool const Keys = false) const { return FindVector(Name.c_str(), Default, Keys); };
+
int FindI(const char *Name,int const &Default = 0) const;
int FindI(std::string const &Name,int const &Default = 0) const {return FindI(Name.c_str(),Default);};
bool FindB(const char *Name,bool const &Default = false) const;
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 47033eadf..8ec868ec0 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -800,8 +800,9 @@ pid_t ExecFork(std::set<int> KeepFDs)
signal(SIGCONT,SIG_DFL);
signal(SIGTSTP,SIG_DFL);
+ long ScOpenMax = sysconf(_SC_OPEN_MAX);
// Close all of our FDs - just in case
- for (int K = 3; K != sysconf(_SC_OPEN_MAX); K++)
+ for (int K = 3; K != ScOpenMax; K++)
{
if(KeepFDs.find(K) == KeepFDs.end())
fcntl(K,F_SETFD,FD_CLOEXEC);
@@ -874,6 +875,25 @@ bool StartsWithGPGClearTextSignature(string const &FileName)
return true;
}
/*}}}*/
+// ChangeOwnerAndPermissionOfFile - set file attributes to requested values /*{{{*/
+bool ChangeOwnerAndPermissionOfFile(char const * const requester, char const * const file, char const * const user, char const * const group, mode_t const mode)
+{
+ if (strcmp(file, "/dev/null") == 0)
+ return true;
+ bool Res = true;
+ if (getuid() == 0 && strlen(user) != 0 && strlen(group) != 0) // if we aren't root, we can't chown, so don't try it
+ {
+ // ensure the file is owned by root and has good permissions
+ struct passwd const * const pw = getpwnam(user);
+ struct group const * const gr = getgrnam(group);
+ if (pw != NULL && gr != NULL && chown(file, pw->pw_uid, gr->gr_gid) != 0)
+ Res &= _error->WarningE(requester, "chown to %s:%s of file %s failed", user, group, file);
+ }
+ if (chmod(file, mode) != 0)
+ Res &= _error->WarningE(requester, "chmod 0%o of file %s failed", mode, file);
+ return Res;
+}
+ /*}}}*/
class FileFdPrivate { /*{{{*/
public:
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index a64d6cb98..97cb05c56 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -195,10 +195,21 @@ pid_t ExecFork(std::set<int> keep_fds);
void MergeKeepFdsFromConfiguration(std::set<int> &keep_fds);
bool ExecWait(pid_t Pid,const char *Name,bool Reap = false);
-
// check if the given file starts with a PGP cleartext signature
bool StartsWithGPGClearTextSignature(std::string const &FileName);
+/** change file attributes to requested known good values
+ *
+ * The method skips the user:group setting if not root.
+ *
+ * @param requester is printed as functionname in error cases
+ * @param file is the file to be modified
+ * @param user is the (new) owner of the file, e.g. _apt
+ * @param group is the (new) group owning the file, e.g. root
+ * @param mode is the access mode of the file, e.g. 0644
+ */
+bool ChangeOwnerAndPermissionOfFile(char const * const requester, char const * const file, char const * const user, char const * const group, mode_t const mode);
+
/**
* \brief Drop privileges
*
diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index 55180c642..46cf0ba08 100644
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -23,6 +23,7 @@
#include <stddef.h>
#include <algorithm>
#include <unistd.h>
+#include <stdlib.h>
#include <string>
#include <iostream>
/*}}}*/
@@ -178,6 +179,22 @@ HashString const * HashStringList::find(char const * const type) const /*{{{*/
return NULL;
}
/*}}}*/
+unsigned long long HashStringList::FileSize() const /*{{{*/
+{
+ HashString const * const hsf = find("Checksum-FileSize");
+ if (hsf == NULL)
+ return 0;
+ std::string const hv = hsf->HashValue();
+ return strtoull(hv.c_str(), NULL, 10);
+}
+ /*}}}*/
+bool HashStringList::FileSize(unsigned long long const Size) /*{{{*/
+{
+ std::string size;
+ strprintf(size, "%llu", Size);
+ return push_back(HashString("Checksum-FileSize", size));
+}
+ /*}}}*/
bool HashStringList::supported(char const * const type) /*{{{*/
{
for (char const * const * t = HashString::SupportedHashes(); *t != NULL; ++t)
@@ -204,15 +221,22 @@ bool HashStringList::push_back(const HashString &hashString) /*{{{*/
/*}}}*/
bool HashStringList::VerifyFile(std::string filename) const /*{{{*/
{
- if (list.empty() == true)
- return false;
- HashString const * const hs = find(NULL);
- if (hs == NULL || hs->VerifyFile(filename) == false)
+ if (usable() == false)
return false;
+
+ Hashes hashes(*this);
+ FileFd file(filename, FileFd::ReadOnly);
HashString const * const hsf = find("Checksum-FileSize");
- if (hsf != NULL && hsf->VerifyFile(filename) == false)
- return false;
- return true;
+ if (hsf != NULL)
+ {
+ std::string fileSize;
+ strprintf(fileSize, "%llu", file.FileSize());
+ if (hsf->HashValue() != fileSize)
+ return false;
+ }
+ hashes.AddFD(file);
+ HashStringList const hsl = hashes.GetHashStringList();
+ return hsl == *this;
}
/*}}}*/
bool HashStringList::operator==(HashStringList const &other) const /*{{{*/
@@ -250,33 +274,34 @@ bool HashStringList::operator!=(HashStringList const &other) const
class PrivateHashes {
public:
unsigned long long FileSize;
+ unsigned int CalcHashes;
- PrivateHashes() : FileSize(0) {}
+ PrivateHashes(unsigned int const CalcHashes) : FileSize(0), CalcHashes(CalcHashes) {}
};
/*}}}*/
// Hashes::Add* - Add the contents of data or FD /*{{{*/
-bool Hashes::Add(const unsigned char * const Data,unsigned long long const Size, unsigned int const Hashes)
+bool Hashes::Add(const unsigned char * const Data, unsigned long long const Size)
{
bool Res = true;
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
- if ((Hashes & MD5SUM) == MD5SUM)
+APT_IGNORE_DEPRECATED_PUSH
+ if ((d->CalcHashes & MD5SUM) == MD5SUM)
Res &= MD5.Add(Data, Size);
- if ((Hashes & SHA1SUM) == SHA1SUM)
+ if ((d->CalcHashes & SHA1SUM) == SHA1SUM)
Res &= SHA1.Add(Data, Size);
- if ((Hashes & SHA256SUM) == SHA256SUM)
+ if ((d->CalcHashes & SHA256SUM) == SHA256SUM)
Res &= SHA256.Add(Data, Size);
- if ((Hashes & SHA512SUM) == SHA512SUM)
+ if ((d->CalcHashes & SHA512SUM) == SHA512SUM)
Res &= SHA512.Add(Data, Size);
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
d->FileSize += Size;
return Res;
}
-bool Hashes::AddFD(int const Fd,unsigned long long Size, unsigned int const Hashes)
+bool Hashes::Add(const unsigned char * const Data, unsigned long long const Size, unsigned int const Hashes)
+{
+ d->CalcHashes = Hashes;
+ return Add(Data, Size);
+}
+bool Hashes::AddFD(int const Fd,unsigned long long Size)
{
unsigned char Buf[64*64];
bool const ToEOF = (Size == UntilEOF);
@@ -290,12 +315,17 @@ bool Hashes::AddFD(int const Fd,unsigned long long Size, unsigned int const Hash
if (ToEOF && Res == 0) // EOF
break;
Size -= Res;
- if (Add(Buf, Res, Hashes) == false)
+ if (Add(Buf, Res) == false)
return false;
}
return true;
}
-bool Hashes::AddFD(FileFd &Fd,unsigned long long Size, unsigned int const Hashes)
+bool Hashes::AddFD(int const Fd,unsigned long long Size, unsigned int const Hashes)
+{
+ d->CalcHashes = Hashes;
+ return AddFD(Fd, Size);
+}
+bool Hashes::AddFD(FileFd &Fd,unsigned long long Size)
{
unsigned char Buf[64*64];
bool const ToEOF = (Size == 0);
@@ -314,37 +344,47 @@ bool Hashes::AddFD(FileFd &Fd,unsigned long long Size, unsigned int const Hashes
else if (a == 0) // EOF
break;
Size -= a;
- if (Add(Buf, a, Hashes) == false)
+ if (Add(Buf, a) == false)
return false;
}
return true;
}
+bool Hashes::AddFD(FileFd &Fd,unsigned long long Size, unsigned int const Hashes)
+{
+ d->CalcHashes = Hashes;
+ return AddFD(Fd, Size);
+}
/*}}}*/
HashStringList Hashes::GetHashStringList()
{
HashStringList hashes;
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
- hashes.push_back(HashString("MD5Sum", MD5.Result().Value()));
- hashes.push_back(HashString("SHA1", SHA1.Result().Value()));
- hashes.push_back(HashString("SHA256", SHA256.Result().Value()));
- hashes.push_back(HashString("SHA512", SHA512.Result().Value()));
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
- std::string SizeStr;
- strprintf(SizeStr, "%llu", d->FileSize);
- hashes.push_back(HashString("Checksum-FileSize", SizeStr));
+APT_IGNORE_DEPRECATED_PUSH
+ if ((d->CalcHashes & MD5SUM) == MD5SUM)
+ hashes.push_back(HashString("MD5Sum", MD5.Result().Value()));
+ if ((d->CalcHashes & SHA1SUM) == SHA1SUM)
+ hashes.push_back(HashString("SHA1", SHA1.Result().Value()));
+ if ((d->CalcHashes & SHA256SUM) == SHA256SUM)
+ hashes.push_back(HashString("SHA256", SHA256.Result().Value()));
+ if ((d->CalcHashes & SHA512SUM) == SHA512SUM)
+ hashes.push_back(HashString("SHA512", SHA512.Result().Value()));
+APT_IGNORE_DEPRECATED_POP
+ hashes.FileSize(d->FileSize);
return hashes;
}
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-Hashes::Hashes() { d = new PrivateHashes(); }
+APT_IGNORE_DEPRECATED_PUSH
+Hashes::Hashes() { d = new PrivateHashes(~0); }
+Hashes::Hashes(unsigned int const Hashes) { d = new PrivateHashes(Hashes); }
+Hashes::Hashes(HashStringList const &Hashes) {
+ unsigned int calcHashes = Hashes.usable() ? 0 : ~0;
+ if (Hashes.find("MD5Sum") != NULL)
+ calcHashes |= MD5SUM;
+ if (Hashes.find("SHA1") != NULL)
+ calcHashes |= SHA1SUM;
+ if (Hashes.find("SHA256") != NULL)
+ calcHashes |= SHA256SUM;
+ if (Hashes.find("SHA512") != NULL)
+ calcHashes |= SHA512SUM;
+ d = new PrivateHashes(calcHashes);
+}
Hashes::~Hashes() { delete d; }
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index e2e213855..e8d84da9e 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -55,6 +55,8 @@ class HashString
// get hash type used
std::string HashType() const { return Type; };
std::string HashValue() const { return Hash; };
+ APT_DEPRECATED std::string HashType() { return Type; };
+ APT_DEPRECATED std::string HashValue() { return Hash; };
// verify the given filename against the currently loaded hash
bool VerifyFile(std::string filename) const;
@@ -85,6 +87,22 @@ class HashStringList
*/
HashString const * find(char const * const type) const;
HashString const * find(std::string const &type) const { return find(type.c_str()); }
+
+ /** finds the filesize hash and returns it as number
+ *
+ * @return beware: if the size isn't known we return \b 0 here,
+ * just like we would do for an empty file. If that is a problem
+ * for you have to get the size manually out of the list.
+ */
+ unsigned long long FileSize() const;
+
+ /** sets the filesize hash
+ *
+ * @param Size of the file
+ * @return @see #push_back
+ */
+ bool FileSize(unsigned long long const Size);
+
/** check if the given hash type is supported
*
* @param type to check
@@ -176,7 +194,8 @@ class Hashes
static const int UntilEOF = 0;
- bool Add(const unsigned char * const Data, unsigned long long const Size, unsigned int const Hashes = ~0);
+ bool Add(const unsigned char * const Data, unsigned long long const Size);
+ APT_DEPRECATED bool Add(const unsigned char * const Data, unsigned long long const Size, unsigned int const Hashes);
inline bool Add(const char * const Data)
{return Add((unsigned char const * const)Data,strlen(Data));};
inline bool Add(const unsigned char * const Beg,const unsigned char * const End)
@@ -184,20 +203,26 @@ class Hashes
enum SupportedHashes { MD5SUM = (1 << 0), SHA1SUM = (1 << 1), SHA256SUM = (1 << 2),
SHA512SUM = (1 << 3) };
- bool AddFD(int const Fd,unsigned long long Size = 0, unsigned int const Hashes = ~0);
- bool AddFD(FileFd &Fd,unsigned long long Size = 0, unsigned int const Hashes = ~0);
+ bool AddFD(int const Fd,unsigned long long Size = 0);
+ APT_DEPRECATED bool AddFD(int const Fd,unsigned long long Size, unsigned int const Hashes);
+ bool AddFD(FileFd &Fd,unsigned long long Size = 0);
+ APT_DEPRECATED bool AddFD(FileFd &Fd,unsigned long long Size, unsigned int const Hashes);
HashStringList GetHashStringList();
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
+ /** create a Hashes object to calculate all supported hashes
+ *
+ * If ALL is too much, you can limit which Hashes are calculated
+ * with the following other constructors which mention explicitly
+ * which hashes to generate. */
Hashes();
+ /** @param Hashes bitflag composed of #SupportedHashes */
+ Hashes(unsigned int const Hashes);
+ /** @param Hashes is a list of hashes */
+ Hashes(HashStringList const &Hashes);
virtual ~Hashes();
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
private:
APT_HIDDEN APT_CONST inline unsigned int boolsToFlag(bool const addMD5, bool const addSHA1, bool const addSHA256, bool const addSHA512)
@@ -211,15 +236,16 @@ class Hashes
}
public:
+APT_IGNORE_DEPRECATED_PUSH
APT_DEPRECATED bool AddFD(int const Fd, unsigned long long Size, bool const addMD5,
bool const addSHA1, bool const addSHA256, bool const addSHA512) {
return AddFD(Fd, Size, boolsToFlag(addMD5, addSHA1, addSHA256, addSHA512));
};
-
APT_DEPRECATED bool AddFD(FileFd &Fd, unsigned long long Size, bool const addMD5,
bool const addSHA1, bool const addSHA256, bool const addSHA512) {
return AddFD(Fd, Size, boolsToFlag(addMD5, addSHA1, addSHA256, addSHA512));
};
+APT_IGNORE_DEPRECATED_POP
};
#endif
diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h
index 3a5e37c63..2f9c6c269 100644
--- a/apt-pkg/contrib/macros.h
+++ b/apt-pkg/contrib/macros.h
@@ -89,7 +89,7 @@
#define APT_MUSTCHECK __attribute__((warn_unused_result))
#else
#define APT_NONNULL(...)
- #define APT_REQRET
+ #define APT_MUSTCHECK
#endif
#if APT_GCC_VERSION >= 0x0400
@@ -132,6 +132,22 @@
#endif
#endif
+#if __GNUC__ >= 4
+ #define APT_IGNORE_DEPRECATED_PUSH \
+ _Pragma("GCC diagnostic push") \
+ _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+ #define APT_IGNORE_DEPRECATED_POP \
+ _Pragma("GCC diagnostic pop")
+ #define APT_IGNORE_DEPRECATED(XXX) \
+ APT_IGNORE_DEPRECATED_PUSH \
+ XXX \
+ APT_IGNORE_DEPRECATED_POP
+#else
+ #define APT_IGNORE_DEPRECATED_PUSH
+ #define APT_IGNORE_DEPRECATED_POP
+ #define APT_IGNORE_DEPRECATED(XXX) XXX
+#endif
+
// These lines are extracted by the makefiles and the buildsystem
// Increasing MAJOR or MINOR results in the need of recompiling all
// reverse-dependencies of libapt-pkg against the new SONAME.
@@ -140,5 +156,6 @@
#define APT_PKG_MAJOR 4
#define APT_PKG_MINOR 15
#define APT_PKG_RELEASE 0
+#define APT_PKG_ABI ((APT_PKG_MAJOR * 100) + APT_PKG_MINOR)
#endif
diff --git a/apt-pkg/contrib/sha2_internal.cc b/apt-pkg/contrib/sha2_internal.cc
index 131ff5beb..f70b7b17d 100644
--- a/apt-pkg/contrib/sha2_internal.cc
+++ b/apt-pkg/contrib/sha2_internal.cc
@@ -129,6 +129,14 @@ typedef u_int64_t sha2_word64; /* Exactly 8 bytes */
/*** ENDIAN REVERSAL MACROS *******************************************/
#if BYTE_ORDER == LITTLE_ENDIAN
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
+#define REVERSE32(w,x) { \
+ (x) = __builtin_bswap32(w); \
+}
+#define REVERSE64(w,x) { \
+ (x) = __builtin_bswap64(w); \
+}
+#else
#define REVERSE32(w,x) { \
sha2_word32 tmp = (w); \
tmp = (tmp >> 16) | (tmp << 16); \
@@ -142,6 +150,7 @@ typedef u_int64_t sha2_word64; /* Exactly 8 bytes */
(x) = ((tmp & 0xffff0000ffff0000ULL) >> 16) | \
((tmp & 0x0000ffff0000ffffULL) << 16); \
}
+#endif
#endif /* BYTE_ORDER == LITTLE_ENDIAN */
/*
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index ebf9c9ea6..5731b5a2b 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -324,21 +324,19 @@ bool ParseCWord(const char *&String,string &Res)
/* */
string QuoteString(const string &Str, const char *Bad)
{
- string Res;
+ std::stringstream Res;
for (string::const_iterator I = Str.begin(); I != Str.end(); ++I)
{
- if (strchr(Bad,*I) != 0 || isprint(*I) == 0 ||
+ if (strchr(Bad,*I) != 0 || isprint(*I) == 0 ||
*I == 0x25 || // percent '%' char
*I <= 0x20 || *I >= 0x7F) // control chars
{
- char Buf[10];
- sprintf(Buf,"%%%02x",(int)*I);
- Res += Buf;
+ ioprintf(Res,"%%%02x",(int)*I);
}
else
- Res += *I;
+ Res << *I;
}
- return Res;
+ return Res.str();
}
/*}}}*/
// DeQuoteString - Convert a string from quoted from /*{{{*/
@@ -379,13 +377,12 @@ string DeQuoteString(string::const_iterator const &begin,
YottaBytes (E24) */
string SizeToStr(double Size)
{
- char S[300];
double ASize;
if (Size >= 0)
ASize = Size;
else
ASize = -1*Size;
-
+
/* bytes, KiloBytes, MegaBytes, GigaBytes, TeraBytes, PetaBytes,
ExaBytes, ZettaBytes, YottaBytes */
char Ext[] = {'\0','k','M','G','T','P','E','Z','Y'};
@@ -394,20 +391,21 @@ string SizeToStr(double Size)
{
if (ASize < 100 && I != 0)
{
- sprintf(S,"%'.1f %c",ASize,Ext[I]);
- break;
+ std::string S;
+ strprintf(S, "%'.1f %c", ASize, Ext[I]);
+ return S;
}
-
+
if (ASize < 10000)
{
- sprintf(S,"%'.0f %c",ASize,Ext[I]);
- break;
+ std::string S;
+ strprintf(S, "%'.0f %c", ASize, Ext[I]);
+ return S;
}
ASize /= 1000.0;
I++;
}
-
- return S;
+ return "";
}
/*}}}*/
// TimeToStr - Convert the time into a string /*{{{*/
@@ -415,36 +413,27 @@ string SizeToStr(double Size)
/* Converts a number of seconds to a hms format */
string TimeToStr(unsigned long Sec)
{
- char S[300];
-
- while (1)
+ std::string S;
+ if (Sec > 60*60*24)
{
- if (Sec > 60*60*24)
- {
- //d means days, h means hours, min means minutes, s means seconds
- sprintf(S,_("%lid %lih %limin %lis"),Sec/60/60/24,(Sec/60/60) % 24,(Sec/60) % 60,Sec % 60);
- break;
- }
-
- if (Sec > 60*60)
- {
- //h means hours, min means minutes, s means seconds
- sprintf(S,_("%lih %limin %lis"),Sec/60/60,(Sec/60) % 60,Sec % 60);
- break;
- }
-
- if (Sec > 60)
- {
- //min means minutes, s means seconds
- sprintf(S,_("%limin %lis"),Sec/60,Sec % 60);
- break;
- }
-
- //s means seconds
- sprintf(S,_("%lis"),Sec);
- break;
+ //TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+ strprintf(S,_("%lid %lih %limin %lis"),Sec/60/60/24,(Sec/60/60) % 24,(Sec/60) % 60,Sec % 60);
+ }
+ else if (Sec > 60*60)
+ {
+ //TRANSLATOR: h means hours, min means minutes, s means seconds
+ strprintf(S,_("%lih %limin %lis"),Sec/60/60,(Sec/60) % 60,Sec % 60);
+ }
+ else if (Sec > 60)
+ {
+ //TRANSLATOR: min means minutes, s means seconds
+ strprintf(S,_("%limin %lis"),Sec/60,Sec % 60);
+ }
+ else
+ {
+ //TRANSLATOR: s means seconds
+ strprintf(S,_("%lis"),Sec);
}
-
return S;
}
/*}}}*/
@@ -1319,10 +1308,12 @@ void ioprintf(ostream &out,const char *format,...)
va_list args;
ssize_t size = 400;
while (true) {
+ bool ret = false;
va_start(args,format);
- if (iovprintf(out, format, args, size) == true)
- return;
+ ret = iovprintf(out, format, args, size);
va_end(args);
+ if (ret == true)
+ return;
}
}
void strprintf(string &out,const char *format,...)
@@ -1331,10 +1322,12 @@ void strprintf(string &out,const char *format,...)
ssize_t size = 400;
std::ostringstream outstr;
while (true) {
+ bool ret = false;
va_start(args,format);
- if (iovprintf(outstr, format, args, size) == true)
- break;
+ ret = iovprintf(outstr, format, args, size);
va_end(args);
+ if (ret == true)
+ break;
}
out = outstr.str();
}
@@ -1419,7 +1412,7 @@ size_t strv_length(const char **str_array)
;
return i;
}
-
+ /*}}}*/
// DeEscapeString - unescape (\0XX and \xXX) from a string /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -1601,56 +1594,49 @@ void URI::CopyFrom(const string &U)
/* */
URI::operator string()
{
- string Res;
-
+ std::stringstream Res;
+
if (Access.empty() == false)
- Res = Access + ':';
-
+ Res << Access << ':';
+
if (Host.empty() == false)
- {
+ {
if (Access.empty() == false)
- Res += "//";
-
+ Res << "//";
+
if (User.empty() == false)
{
// FIXME: Technically userinfo is permitted even less
// characters than these, but this is not conveniently
// expressed with a blacklist.
- Res += QuoteString(User, ":/?#[]@");
+ Res << QuoteString(User, ":/?#[]@");
if (Password.empty() == false)
- Res += ":" + QuoteString(Password, ":/?#[]@");
- Res += "@";
+ Res << ":" << QuoteString(Password, ":/?#[]@");
+ Res << "@";
}
-
+
// Add RFC 2732 escaping characters
- if (Access.empty() == false &&
- (Host.find('/') != string::npos || Host.find(':') != string::npos))
- Res += '[' + Host + ']';
+ if (Access.empty() == false && Host.find_first_of("/:") != string::npos)
+ Res << '[' << Host << ']';
else
- Res += Host;
-
+ Res << Host;
+
if (Port != 0)
- {
- char S[30];
- sprintf(S,":%u",Port);
- Res += S;
- }
+ Res << ':' << Port;
}
-
+
if (Path.empty() == false)
{
if (Path[0] != '/')
- Res += "/" + Path;
+ Res << "/" << Path;
else
- Res += Path;
+ Res << Path;
}
-
- return Res;
+
+ return Res.str();
}
/*}}}*/
// URI::SiteOnly - Return the schema and site for the URI /*{{{*/
-// ---------------------------------------------------------------------
-/* */
string URI::SiteOnly(const string &URI)
{
::URI U(URI);
@@ -1660,9 +1646,18 @@ string URI::SiteOnly(const string &URI)
return U;
}
/*}}}*/
+// URI::ArchiveOnly - Return the schema, site and cleaned path for the URI /*{{{*/
+string URI::ArchiveOnly(const string &URI)
+{
+ ::URI U(URI);
+ U.User.clear();
+ U.Password.clear();
+ if (U.Path.empty() == false && U.Path[U.Path.length() - 1] == '/')
+ U.Path.erase(U.Path.length() - 1);
+ return U;
+}
+ /*}}}*/
// URI::NoUserPassword - Return the schema, site and path for the URI /*{{{*/
-// ---------------------------------------------------------------------
-/* */
string URI::NoUserPassword(const string &URI)
{
::URI U(URI);
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index e20ddca9c..01bbfef72 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -81,7 +81,7 @@ bool TokSplitString(char Tok,char *Input,char **List,
unsigned long ListMax);
// split a given string by a char
-std::vector<std::string> VectorizeString(std::string const &haystack, char const &split) APT_CONST;
+std::vector<std::string> VectorizeString(std::string const &haystack, char const &split) APT_PURE;
/* \brief Return a vector of strings from string "input" where "sep"
* is used as the delimiter string.
@@ -167,6 +167,7 @@ class URI
inline void operator =(const std::string &From) {CopyFrom(From);}
inline bool empty() {return Access.empty();};
static std::string SiteOnly(const std::string &URI);
+ static std::string ArchiveOnly(const std::string &URI);
static std::string NoUserPassword(const std::string &URI);
URI(std::string Path) {CopyFrom(Path);}
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 335f9d36e..0fffa52b0 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -34,6 +34,7 @@
#include <stdio.h>
#include <iostream>
+#include <sstream>
#include <string>
#include <sys/stat.h>
/*}}}*/
@@ -43,8 +44,8 @@ using std::string;
// SourcesIndex::debSourcesIndex - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-debSourcesIndex::debSourcesIndex(string URI,string Dist,string Section,bool Trusted) :
- pkgIndexFile(Trusted), URI(URI), Dist(Dist), Section(Section)
+debSourcesIndex::debSourcesIndex(IndexTarget const &Target,bool const Trusted) :
+ pkgIndexTargetFile(Target, Trusted)
{
}
/*}}}*/
@@ -55,16 +56,9 @@ debSourcesIndex::debSourcesIndex(string URI,string Dist,string Section,bool Trus
string debSourcesIndex::SourceInfo(pkgSrcRecords::Parser const &Record,
pkgSrcRecords::File const &File) const
{
- string Res;
- Res = ::URI::NoUserPassword(URI) + ' ';
- if (Dist[Dist.size() - 1] == '/')
- {
- if (Dist != "/")
- Res += Dist;
- }
- else
- Res += Dist + '/' + Section;
-
+ string Res = Target.Description;
+ Res.erase(Target.Description.rfind(' '));
+
Res += " ";
Res += Record.Package();
Res += " ";
@@ -79,129 +73,19 @@ string debSourcesIndex::SourceInfo(pkgSrcRecords::Parser const &Record,
/* */
pkgSrcRecords::Parser *debSourcesIndex::CreateSrcParser() const
{
- string SourcesURI = _config->FindDir("Dir::State::lists") +
- URItoFileName(IndexURI("Sources"));
-
- std::vector<std::string> types = APT::Configuration::getCompressionTypes();
- for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t)
- {
- string p;
- p = SourcesURI + '.' + *t;
- if (FileExists(p))
- return new debSrcRecordParser(p, this);
- }
+ string const SourcesURI = IndexFileName();
if (FileExists(SourcesURI))
return new debSrcRecordParser(SourcesURI, this);
return NULL;
}
/*}}}*/
-// SourcesIndex::Describe - Give a descriptive path to the index /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debSourcesIndex::Describe(bool Short) const
-{
- char S[300];
- if (Short == true)
- snprintf(S,sizeof(S),"%s",Info("Sources").c_str());
- else
- snprintf(S,sizeof(S),"%s (%s)",Info("Sources").c_str(),
- IndexFile("Sources").c_str());
-
- return S;
-}
- /*}}}*/
-// SourcesIndex::Info - One liner describing the index URI /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debSourcesIndex::Info(const char *Type) const
-{
- string Info = ::URI::NoUserPassword(URI) + ' ';
- if (Dist[Dist.size() - 1] == '/')
- {
- if (Dist != "/")
- Info += Dist;
- }
- else
- Info += Dist + '/' + Section;
- Info += " ";
- Info += Type;
- return Info;
-}
- /*}}}*/
-// SourcesIndex::Index* - Return the URI to the index files /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debSourcesIndex::IndexFile(const char *Type) const
-{
- string s = URItoFileName(IndexURI(Type));
-
- std::vector<std::string> types = APT::Configuration::getCompressionTypes();
- for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t)
- {
- string p = s + '.' + *t;
- if (FileExists(p))
- return p;
- }
- return s;
-}
-
-string debSourcesIndex::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 +
- "/source/";
-
- Res += Type;
- return Res;
-}
- /*}}}*/
-// SourcesIndex::Exists - Check if the index is available /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debSourcesIndex::Exists() const
-{
- return FileExists(IndexFile("Sources"));
-}
- /*}}}*/
-// SourcesIndex::Size - Return the size of the index /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-unsigned long debSourcesIndex::Size() const
-{
- unsigned long size = 0;
-
- /* we need to ignore errors here; if the lists are absent, just return 0 */
- _error->PushToStack();
-
- FileFd f(IndexFile("Sources"), FileFd::ReadOnly, FileFd::Extension);
- if (!f.Failed())
- size = f.Size();
-
- if (_error->PendingError() == true)
- size = 0;
- _error->RevertToStack();
-
- return size;
-}
- /*}}}*/
// PackagesIndex::debPackagesIndex - Contructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-debPackagesIndex::debPackagesIndex(string const &URI, string const &Dist, string const &Section,
- bool const &Trusted, string const &Arch) :
- pkgIndexFile(Trusted), URI(URI), Dist(Dist), Section(Section), Architecture(Arch)
+debPackagesIndex::debPackagesIndex(IndexTarget const &Target, bool const Trusted) :
+ pkgIndexTargetFile(Target, Trusted)
{
- if (Architecture == "native")
- Architecture = _config->Find("APT::Architecture");
}
/*}}}*/
// PackagesIndex::ArchiveInfo - Short version of the archive url /*{{{*/
@@ -209,137 +93,42 @@ debPackagesIndex::debPackagesIndex(string const &URI, string const &Dist, string
/* This is a shorter version that is designed to be < 60 chars or so */
string debPackagesIndex::ArchiveInfo(pkgCache::VerIterator Ver) const
{
- string Res = ::URI::NoUserPassword(URI) + ' ';
- if (Dist[Dist.size() - 1] == '/')
- {
- if (Dist != "/")
- Res += Dist;
- }
- else
- Res += Dist + '/' + Section;
-
+ std::string const Dist = Target.Option(IndexTarget::RELEASE);
+ string Res = Target.Option(IndexTarget::SITE) + " " + Dist;
+ std::string const Component = Target.Option(IndexTarget::COMPONENT);
+ if (Component.empty() == false)
+ Res += "/" + Component;
+
Res += " ";
Res += Ver.ParentPkg().Name();
Res += " ";
- if (Dist[Dist.size() - 1] != '/')
+ if (Dist.empty() == false && Dist[Dist.size() - 1] != '/')
Res.append(Ver.Arch()).append(" ");
Res += Ver.VerStr();
return Res;
}
/*}}}*/
-// PackagesIndex::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 debPackagesIndex::Describe(bool Short) const
-{
- char S[300];
- if (Short == true)
- snprintf(S,sizeof(S),"%s",Info("Packages").c_str());
- else
- snprintf(S,sizeof(S),"%s (%s)",Info("Packages").c_str(),
- IndexFile("Packages").c_str());
- return S;
-}
- /*}}}*/
-// PackagesIndex::Info - One liner describing the index URI /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debPackagesIndex::Info(const char *Type) const
-{
- string Info = ::URI::NoUserPassword(URI) + ' ';
- if (Dist[Dist.size() - 1] == '/')
- {
- if (Dist != "/")
- Info += Dist;
- }
- else
- Info += Dist + '/' + Section;
- Info += " ";
- if (Dist[Dist.size() - 1] != '/')
- Info += Architecture + " ";
- Info += Type;
- return Info;
-}
- /*}}}*/
-// PackagesIndex::Index* - Return the URI to the index files /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debPackagesIndex::IndexFile(const char *Type) const
-{
- string s =_config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type));
-
- std::vector<std::string> types = APT::Configuration::getCompressionTypes();
- for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t)
- {
- string p = s + '.' + *t;
- if (FileExists(p))
- return p;
- }
- return s;
-}
-string debPackagesIndex::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 +
- "/binary-" + Architecture + '/';
-
- Res += Type;
- return Res;
-}
- /*}}}*/
-// PackagesIndex::Exists - Check if the index is available /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debPackagesIndex::Exists() const
-{
- return FileExists(IndexFile("Packages"));
-}
- /*}}}*/
-// PackagesIndex::Size - Return the size of the index /*{{{*/
-// ---------------------------------------------------------------------
-/* This is really only used for progress reporting. */
-unsigned long debPackagesIndex::Size() const
-{
- unsigned long size = 0;
-
- /* we need to ignore errors here; if the lists are absent, just return 0 */
- _error->PushToStack();
-
- FileFd f(IndexFile("Packages"), FileFd::ReadOnly, FileFd::Extension);
- if (!f.Failed())
- size = f.Size();
-
- if (_error->PendingError() == true)
- size = 0;
- _error->RevertToStack();
-
- return size;
-}
- /*}}}*/
// PackagesIndex::Merge - Load the index file into a cache /*{{{*/
// ---------------------------------------------------------------------
/* */
bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
{
- string PackageFile = IndexFile("Packages");
+ string const PackageFile = IndexFileName();
FileFd Pkg(PackageFile,FileFd::ReadOnly, FileFd::Extension);
- debListParser Parser(&Pkg, Architecture);
+ debListParser Parser(&Pkg, Target.Option(IndexTarget::ARCHITECTURE));
if (_error->PendingError() == true)
return _error->Error("Problem opening %s",PackageFile.c_str());
if (Prog != NULL)
- Prog->SubProgress(0,Info("Packages"));
+ Prog->SubProgress(0, Target.Description);
+
+
+ std::string const URI = Target.Option(IndexTarget::REPO_URI);
+ std::string Dist = Target.Option(IndexTarget::RELEASE);
+ if (Dist.empty())
+ Dist = "/";
::URI Tmp(URI);
- if (Gen.SelectFile(PackageFile,Tmp.Host,*this) == false)
+ if (Gen.SelectFile(PackageFile, *this, Target.Option(IndexTarget::ARCHITECTURE), Target.Option(IndexTarget::COMPONENT)) == false)
return _error->Error("Problem with SelectFile %s",PackageFile.c_str());
// Store the IMS information
@@ -347,31 +136,10 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
pkgCacheGenerator::Dynamic<pkgCache::PkgFileIterator> DynFile(File);
File->Size = Pkg.FileSize();
File->mtime = Pkg.ModificationTime();
-
+
if (Gen.MergeList(Parser) == false)
return _error->Error("Problem with MergeList %s",PackageFile.c_str());
- // Check the release file
- string ReleaseFile = debReleaseIndex(URI,Dist).MetaIndexFile("InRelease");
- bool releaseExists = false;
- if (FileExists(ReleaseFile) == true)
- releaseExists = true;
- else
- ReleaseFile = debReleaseIndex(URI,Dist).MetaIndexFile("Release");
-
- if (releaseExists == true || FileExists(ReleaseFile) == true)
- {
- FileFd Rel;
- // Beware: The 'Release' file might be clearsigned in case the
- // signature for an 'InRelease' file couldn't be checked
- if (OpenMaybeClearSignedFile(ReleaseFile, Rel) == false)
- return false;
-
- if (_error->PendingError() == true)
- return false;
- Parser.LoadReleaseInfo(File,Rel,Section);
- }
-
return true;
}
/*}}}*/
@@ -380,7 +148,7 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
/* */
pkgCache::PkgFileIterator debPackagesIndex::FindInCache(pkgCache &Cache) const
{
- string FileName = IndexFile("Packages");
+ string const FileName = IndexFileName();
pkgCache::PkgFileIterator File = Cache.FileBegin();
for (; File.end() == false; ++File)
{
@@ -410,113 +178,13 @@ pkgCache::PkgFileIterator debPackagesIndex::FindInCache(pkgCache &Cache) const
/*}}}*/
// TranslationsIndex::debTranslationsIndex - Contructor /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-debTranslationsIndex::debTranslationsIndex(string URI,string Dist,string Section,
- char const * const Translation) :
- pkgIndexFile(true), URI(URI), Dist(Dist), Section(Section),
- Language(Translation)
+debTranslationsIndex::debTranslationsIndex(IndexTarget const &Target) :
+ pkgIndexTargetFile(Target, true)
{}
/*}}}*/
-// TranslationIndex::Trans* - Return the URI to the translation files /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debTranslationsIndex::IndexFile(const char *Type) const
-{
- string s =_config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type));
-
- std::vector<std::string> types = APT::Configuration::getCompressionTypes();
- for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t)
- {
- string p = s + '.' + *t;
- if (FileExists(p))
- return p;
- }
- return s;
-}
-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::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(Language).c_str());
- return S;
-}
- /*}}}*/
-// TranslationsIndex::Info - One liner describing the index URI /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debTranslationsIndex::Info(const char *Type) const
-{
- string Info = ::URI::NoUserPassword(URI) + ' ';
- if (Dist[Dist.size() - 1] == '/')
- {
- if (Dist != "/")
- Info += Dist;
- }
- else
- Info += Dist + '/' + Section;
- Info += " ";
- Info += Type;
- return Info;
-}
- /*}}}*/
bool debTranslationsIndex::HasPackages() const /*{{{*/
{
- return FileExists(IndexFile(Language));
-}
- /*}}}*/
-// TranslationsIndex::Exists - Check if the index is available /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debTranslationsIndex::Exists() const
-{
- return FileExists(IndexFile(Language));
-}
- /*}}}*/
-// TranslationsIndex::Size - Return the size of the index /*{{{*/
-// ---------------------------------------------------------------------
-/* This is really only used for progress reporting. */
-unsigned long debTranslationsIndex::Size() const
-{
- unsigned long size = 0;
-
- /* we need to ignore errors here; if the lists are absent, just return 0 */
- _error->PushToStack();
-
- FileFd f(IndexFile(Language), FileFd::ReadOnly, FileFd::Extension);
- if (!f.Failed())
- size = f.Size();
-
- if (_error->PendingError() == true)
- size = 0;
- _error->RevertToStack();
-
- return size;
+ return Exists();
}
/*}}}*/
// TranslationsIndex::Merge - Load the index file into a cache /*{{{*/
@@ -525,24 +193,24 @@ unsigned long debTranslationsIndex::Size() const
bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
{
// Check the translation file, if in use
- string TranslationFile = IndexFile(Language);
+ string const TranslationFile = IndexFileName();
if (FileExists(TranslationFile))
{
FileFd Trans(TranslationFile,FileFd::ReadOnly, FileFd::Extension);
debTranslationsParser TransParser(&Trans);
if (_error->PendingError() == true)
return false;
-
+
if (Prog != NULL)
- Prog->SubProgress(0, Info(TranslationFile.c_str()));
- if (Gen.SelectFile(TranslationFile,string(),*this) == false)
+ Prog->SubProgress(0, Target.Description);
+ if (Gen.SelectFile(TranslationFile, *this, "", Target.Option(IndexTarget::COMPONENT), pkgCache::Flag::NotSource | pkgCache::Flag::NoPackages) == false)
return _error->Error("Problem with SelectFile %s",TranslationFile.c_str());
// Store the IMS information
pkgCache::PkgFileIterator TransFile = Gen.GetCurFile();
TransFile->Size = Trans.FileSize();
TransFile->mtime = Trans.ModificationTime();
-
+
if (Gen.MergeList(TransParser) == false)
return _error->Error("Problem with MergeList %s",TranslationFile.c_str());
}
@@ -555,8 +223,8 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
/* */
pkgCache::PkgFileIterator debTranslationsIndex::FindInCache(pkgCache &Cache) const
{
- string FileName = IndexFile(Language);
-
+ string FileName = IndexFileName();
+
pkgCache::PkgFileIterator File = Cache.FileBegin();
for (; File.end() == false; ++File)
{
@@ -579,10 +247,11 @@ pkgCache::PkgFileIterator debTranslationsIndex::FindInCache(pkgCache &Cache) con
return pkgCache::PkgFileIterator(Cache);
}
return File;
- }
+ }
return File;
}
/*}}}*/
+
// StatusIndex::debStatusIndex - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -615,18 +284,17 @@ bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
if (Prog != NULL)
Prog->SubProgress(0,File);
- if (Gen.SelectFile(File,string(),*this,pkgCache::Flag::NotSource) == false)
+ if (Gen.SelectFile(File, *this, "", "now", pkgCache::Flag::NotSource) == false)
return _error->Error("Problem with SelectFile %s",File.c_str());
// Store the IMS information
pkgCache::PkgFileIterator CFile = Gen.GetCurFile();
+ pkgCacheGenerator::Dynamic<pkgCache::PkgFileIterator> DynFile(CFile);
CFile->Size = Pkg.FileSize();
CFile->mtime = Pkg.ModificationTime();
- map_stringitem_t const storage = Gen.StoreString(pkgCacheGenerator::MIXED, "now");
- CFile->Archive = storage;
-
+
if (Gen.MergeList(Parser) == false)
- return _error->Error("Problem with MergeList %s",File.c_str());
+ return _error->Error("Problem with MergeList %s",File.c_str());
return true;
}
/*}}}*/
@@ -671,8 +339,7 @@ APT_CONST bool debStatusIndex::Exists() const
}
/*}}}*/
-// debDebPkgFile - Single .deb file /*{{{*/
-// ---------------------------------------------------------------------
+// debDebPkgFile - Single .deb file /*{{{*/
debDebPkgFileIndex::debDebPkgFileIndex(std::string DebFile)
: pkgIndexFile(true), DebFile(DebFile)
{
@@ -688,64 +355,67 @@ bool debDebPkgFileIndex::Exists() const
{
return FileExists(DebFile);
}
-bool debDebPkgFileIndex::Merge(pkgCacheGenerator& Gen, OpProgress* Prog) const
+bool debDebPkgFileIndex::GetContent(std::ostream &content, std::string const &debfile)
{
- if(Prog)
- Prog->SubProgress(0, "Reading deb file");
-
- // get the control data out of the deb file vid dpkg -I
- // ... can I haz libdpkg?
- Configuration::Item const *Opts = _config->Tree("DPkg::Options");
- std::string dpkg = _config->Find("Dir::Bin::dpkg","dpkg");
+ // get the control data out of the deb file via dpkg-deb -I
+ std::string dpkg = _config->Find("Dir::Bin::dpkg","dpkg-deb");
std::vector<const char *> Args;
Args.push_back(dpkg.c_str());
- if (Opts != 0)
- {
- Opts = Opts->Child;
- for (; Opts != 0; Opts = Opts->Next)
- {
- if (Opts->Value.empty() == true)
- continue;
- Args.push_back(Opts->Value.c_str());
- }
- }
Args.push_back("-I");
- Args.push_back(DebFile.c_str());
+ Args.push_back(debfile.c_str());
Args.push_back("control");
Args.push_back(NULL);
FileFd PipeFd;
pid_t Child;
if(Popen((const char**)&Args[0], PipeFd, Child, FileFd::ReadOnly) == false)
return _error->Error("Popen failed");
- // FIXME: static buffer
- char buf[8*1024];
- unsigned long long n = 0;
- if(PipeFd.Read(buf, sizeof(buf)-1, &n) == false)
- return _error->Errno("read", "Failed to read dpkg pipe");
+
+ char buffer[1024];
+ do {
+ unsigned long long actual = 0;
+ if (PipeFd.Read(buffer, sizeof(buffer)-1, &actual) == false)
+ return _error->Errno("read", "Failed to read dpkg pipe");
+ if (actual == 0)
+ break;
+ buffer[actual] = '\0';
+ content << buffer;
+ } while(true);
ExecWait(Child, "Popen");
- // now write the control data to a tempfile
+ content << "Filename: " << debfile << "\n";
+ struct stat Buf;
+ if (stat(debfile.c_str(), &Buf) != 0)
+ return false;
+ content << "Size: " << Buf.st_size << "\n";
+
+ return true;
+}
+bool debDebPkgFileIndex::Merge(pkgCacheGenerator& Gen, OpProgress* Prog) const
+{
+ if(Prog)
+ Prog->SubProgress(0, "Reading deb file");
+
+ // write the control data to a tempfile
SPtr<FileFd> DebControl = GetTempFile("deb-file-" + flNotDir(DebFile));
if(DebControl == NULL)
return false;
- DebControl->Write(buf, n);
- // append size of the file
- FileFd Fd(DebFile, FileFd::ReadOnly);
- string Size;
- strprintf(Size, "Size: %llu\n", Fd.Size());
- DebControl->Write(Size.c_str(), Size.size());
- // and rewind for the listparser
+ std::ostringstream content;
+ if (GetContent(content, DebFile) == false)
+ return false;
+ std::string const contentstr = content.str();
+ DebControl->Write(contentstr.c_str(), contentstr.length());
+ // rewind for the listparser
DebControl->Seek(0);
// and give it to the list parser
debDebFileParser Parser(DebControl, DebFile);
- if(Gen.SelectFile(DebFile, "local", *this) == false)
+ if(Gen.SelectFile(DebFile, *this, "", "now", pkgCache::Flag::LocalSource) == false)
return _error->Error("Problem with SelectFile %s", DebFile.c_str());
pkgCache::PkgFileIterator File = Gen.GetCurFile();
File->Size = DebControl->Size();
File->mtime = DebControl->ModificationTime();
-
+
if (Gen.MergeList(Parser) == false)
return _error->Error("Problem with MergeLister for %s", DebFile.c_str());
@@ -802,13 +472,13 @@ pkgSrcRecords::Parser *debDscFileIndex::CreateSrcParser() const
}
/*}}}*/
// Index File types for Debian /*{{{*/
-class debIFTypeSrc : public pkgIndexFile::Type
+class APT_HIDDEN debIFTypeSrc : public pkgIndexFile::Type
{
public:
debIFTypeSrc() {Label = "Debian Source Index";};
};
-class debIFTypePkg : public pkgIndexFile::Type
+class APT_HIDDEN debIFTypePkg : public pkgIndexFile::Type
{
public:
@@ -818,12 +488,12 @@ class debIFTypePkg : public pkgIndexFile::Type
};
debIFTypePkg() {Label = "Debian Package Index";};
};
-class debIFTypeTrans : public debIFTypePkg
+class APT_HIDDEN debIFTypeTrans : public debIFTypePkg
{
public:
debIFTypeTrans() {Label = "Debian Translation Index";};
};
-class debIFTypeStatus : public pkgIndexFile::Type
+class APT_HIDDEN debIFTypeStatus : public pkgIndexFile::Type
{
public:
@@ -833,16 +503,16 @@ class debIFTypeStatus : public pkgIndexFile::Type
};
debIFTypeStatus() {Label = "Debian dpkg status file";};
};
-class debIFTypeDebPkgFile : public pkgIndexFile::Type
+class APT_HIDDEN debIFTypeDebPkgFile : public pkgIndexFile::Type
{
public:
virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator File) const
{
- return new debDebFileRecordParser(File.FileName(),*File.Cache());
+ return new debDebFileRecordParser(File.FileName());
};
debIFTypeDebPkgFile() {Label = "deb Package file";};
};
-class debIFTypeDscFile : public pkgIndexFile::Type
+class APT_HIDDEN debIFTypeDscFile : public pkgIndexFile::Type
{
public:
virtual pkgSrcRecords::Parser *CreateSrcPkgParser(std::string DscFile) const
@@ -851,7 +521,7 @@ class debIFTypeDscFile : public pkgIndexFile::Type
};
debIFTypeDscFile() {Label = "dsc File Source Index";};
};
-class debIFTypeDebianSourceDir : public pkgIndexFile::Type
+class APT_HIDDEN debIFTypeDebianSourceDir : public pkgIndexFile::Type
{
public:
virtual pkgSrcRecords::Parser *CreateSrcPkgParser(std::string SourceDir) const
@@ -861,14 +531,14 @@ class debIFTypeDebianSourceDir : public pkgIndexFile::Type
debIFTypeDebianSourceDir() {Label = "debian/control File Source Index";};
};
-static debIFTypeSrc _apt_Src;
-static debIFTypePkg _apt_Pkg;
-static debIFTypeTrans _apt_Trans;
-static debIFTypeStatus _apt_Status;
-static debIFTypeDebPkgFile _apt_DebPkgFile;
+APT_HIDDEN debIFTypeSrc _apt_Src;
+APT_HIDDEN debIFTypePkg _apt_Pkg;
+APT_HIDDEN debIFTypeTrans _apt_Trans;
+APT_HIDDEN debIFTypeStatus _apt_Status;
+APT_HIDDEN debIFTypeDebPkgFile _apt_DebPkgFile;
// file based pseudo indexes
-static debIFTypeDscFile _apt_DscFile;
-static debIFTypeDebianSourceDir _apt_DebianSourceDir;
+APT_HIDDEN debIFTypeDscFile _apt_DscFile;
+APT_HIDDEN debIFTypeDebianSourceDir _apt_DebianSourceDir;
const pkgIndexFile::Type *debSourcesIndex::GetType() const
{
@@ -906,3 +576,4 @@ debTranslationsIndex::~debTranslationsIndex() {}
debSourcesIndex::~debSourcesIndex() {}
debDebPkgFileIndex::~debDebPkgFileIndex() {}
+debDscFileIndex::~debDscFileIndex() {}
diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index d727d9547..6285a9e5c 100644
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -1,6 +1,5 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: debindexfile.h,v 1.3.2.1 2003/12/24 23:09:17 mdz Exp $
/* ######################################################################
Debian Index Files
@@ -28,117 +27,68 @@ class pkgAcquire;
class pkgCacheGenerator;
-class debStatusIndex : public pkgIndexFile
+class APT_HIDDEN debStatusIndex : public pkgIndexFile
{
- /** \brief dpointer placeholder (for later in case we need it) */
void *d;
-
protected:
std::string File;
public:
virtual const Type *GetType() const APT_CONST;
-
+
// Interface for acquire
virtual std::string Describe(bool /*Short*/) const {return File;};
-
+
// Interface for the Cache Generator
virtual bool Exists() const;
virtual bool HasPackages() const {return true;};
virtual unsigned long Size() const;
virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
- bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog, unsigned long const Flag) const;
virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
debStatusIndex(std::string File);
virtual ~debStatusIndex();
};
-
-class debPackagesIndex : public pkgIndexFile
+
+class APT_HIDDEN debPackagesIndex : public pkgIndexTargetFile
{
- /** \brief dpointer placeholder (for later in case we need it) */
void *d;
-
- std::string URI;
- std::string Dist;
- std::string Section;
- std::string Architecture;
-
- APT_HIDDEN std::string Info(const char *Type) const;
- APT_HIDDEN std::string IndexFile(const char *Type) const;
- APT_HIDDEN std::string IndexURI(const char *Type) const;
-
public:
-
+
virtual const Type *GetType() const APT_CONST;
// Stuff for accessing files on remote items
virtual std::string ArchiveInfo(pkgCache::VerIterator Ver) const;
- virtual std::string ArchiveURI(std::string File) const {return URI + File;};
-
- // Interface for acquire
- virtual std::string Describe(bool Short) const;
-
+
// Interface for the Cache Generator
- virtual bool Exists() const;
virtual bool HasPackages() const {return true;};
- virtual unsigned long Size() const;
virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
- debPackagesIndex(std::string const &URI, std::string const &Dist, std::string const &Section,
- bool const &Trusted, std::string const &Arch = "native");
+ debPackagesIndex(IndexTarget const &Target, bool const Trusted);
virtual ~debPackagesIndex();
};
-class debTranslationsIndex : public pkgIndexFile
+class APT_HIDDEN debTranslationsIndex : public pkgIndexTargetFile
{
- /** \brief dpointer placeholder (for later in case we need it) */
void *d;
-
- std::string URI;
- std::string Dist;
- std::string Section;
- const char * const Language;
-
- APT_HIDDEN std::string Info(const char *Type) const;
- APT_HIDDEN std::string IndexFile(const char *Type) const;
- APT_HIDDEN std::string IndexURI(const char *Type) const;
-
- APT_HIDDEN std::string TranslationFile() const {return std::string("Translation-").append(Language);};
-
public:
-
+
virtual const Type *GetType() const APT_CONST;
- // Interface for acquire
- virtual std::string Describe(bool Short) 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(std::string URI,std::string Dist,std::string Section, char const * const Language);
+ debTranslationsIndex(IndexTarget const &Target);
virtual ~debTranslationsIndex();
};
-class debSourcesIndex : public pkgIndexFile
+class APT_HIDDEN debSourcesIndex : public pkgIndexTargetFile
{
- /** \brief dpointer placeholder (for later in case we need it) */
void *d;
-
- std::string URI;
- std::string Dist;
- std::string Section;
-
- APT_HIDDEN std::string Info(const char *Type) const;
- APT_HIDDEN std::string IndexFile(const char *Type) const;
- APT_HIDDEN std::string IndexURI(const char *Type) const;
-
public:
virtual const Type *GetType() const APT_CONST;
@@ -146,24 +96,18 @@ class debSourcesIndex : public pkgIndexFile
// Stuff for accessing files on remote items
virtual std::string SourceInfo(pkgSrcRecords::Parser const &Record,
pkgSrcRecords::File const &File) const;
- virtual std::string ArchiveURI(std::string File) const {return URI + File;};
-
- // Interface for acquire
- virtual std::string Describe(bool Short) const;
// Interface for the record parsers
virtual pkgSrcRecords::Parser *CreateSrcParser() const;
-
+
// Interface for the Cache Generator
- virtual bool Exists() const;
virtual bool HasPackages() const {return false;};
- virtual unsigned long Size() const;
-
- debSourcesIndex(std::string URI,std::string Dist,std::string Section,bool Trusted);
+
+ debSourcesIndex(IndexTarget const &Target, bool const Trusted);
virtual ~debSourcesIndex();
};
-class debDebPkgFileIndex : public pkgIndexFile
+class APT_HIDDEN debDebPkgFileIndex : public pkgIndexFile
{
private:
void *d;
@@ -177,6 +121,14 @@ class debDebPkgFileIndex : public pkgIndexFile
return DebFile;
}
+ /** get the control (file) content of the deb file
+ *
+ * @param[out] content of the control file
+ * @param debfile is the filename of the .deb-file
+ * @return \b true if successful, otherwise \b false.
+ */
+ static bool GetContent(std::ostream &content, std::string const &debfile);
+
// Interface for the Cache Generator
virtual bool Exists() const;
virtual bool HasPackages() const {
@@ -193,9 +145,10 @@ class debDebPkgFileIndex : public pkgIndexFile
virtual ~debDebPkgFileIndex();
};
-class debDscFileIndex : public pkgIndexFile
+class APT_HIDDEN debDscFileIndex : public pkgIndexFile
{
private:
+ void *d;
std::string DscFile;
public:
virtual const Type *GetType() const APT_CONST;
@@ -208,10 +161,10 @@ class debDscFileIndex : public pkgIndexFile
};
debDscFileIndex(std::string &DscFile);
- virtual ~debDscFileIndex() {};
+ virtual ~debDscFileIndex();
};
-class debDebianSourceDirIndex : public debDscFileIndex
+class APT_HIDDEN debDebianSourceDirIndex : public debDscFileIndex
{
public:
virtual const Type *GetType() const APT_CONST;
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 616d8296d..c5e77b0ff 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -141,6 +141,7 @@ bool debListParser::NewVersion(pkgCache::VerIterator &Ver)
map_stringitem_t const idx = StoreString(pkgCacheGenerator::SECTION, Start, Stop - Start);
Ver->Section = idx;
}
+#if APT_PKG_ABI >= 413
// Parse the source package name
pkgCache::GrpIterator const G = Ver.ParentPkg().Group();
Ver->SourcePkgName = G->Name;
@@ -192,6 +193,7 @@ bool debListParser::NewVersion(pkgCache::VerIterator &Ver)
}
}
}
+#endif
Ver->MultiArch = ParseMultiArch(true);
// Archive Size
@@ -804,7 +806,7 @@ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver,
if (NewDepends(Ver,Package,"none",Version,Op,Type) == false)
return false;
}
- else if (MultiArchEnabled == true && found != string::npos &&
+ else if (found != string::npos &&
strcmp(Package.c_str() + found, ":any") != 0)
{
string Arch = Package.substr(found+1, string::npos);
@@ -851,10 +853,16 @@ bool debListParser::ParseProvides(pkgCache::VerIterator &Ver)
while (1)
{
Start = ParseDepends(Start,Stop,Package,Version,Op);
+ const size_t archfound = Package.rfind(':');
if (Start == 0)
return _error->Error("Problem parsing Provides line");
if (Op != pkgCache::Dep::NoOp && Op != pkgCache::Dep::Equals) {
_error->Warning("Ignoring Provides line with non-equal DepCompareOp for package %s", Package.c_str());
+ } else if (archfound != string::npos) {
+ string OtherArch = Package.substr(archfound+1, string::npos);
+ Package = Package.substr(0, archfound);
+ if (NewProvides(Ver, Package, OtherArch, Version) == false)
+ return false;
} else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign) {
if (NewProvidesAllArch(Ver, Package, Version) == false)
return false;
@@ -943,43 +951,6 @@ bool debListParser::Step()
return false;
}
/*}}}*/
-// ListParser::LoadReleaseInfo - Load the release information /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
- FileFd &File, string component)
-{
- // apt-secure does no longer download individual (per-section) Release
- // file. to provide Component pinning we use the section name now
- map_stringitem_t const storage = StoreString(pkgCacheGenerator::MIXED, component);
- FileI->Component = storage;
-
- pkgTagFile TagFile(&File, File.Size());
- pkgTagSection Section;
- if (_error->PendingError() == true || TagFile.Step(Section) == false)
- return false;
-
- std::string data;
- #define APT_INRELEASE(TYPE, TAG, STORE) \
- data = Section.FindS(TAG); \
- if (data.empty() == false) \
- { \
- map_stringitem_t const storage = StoreString(pkgCacheGenerator::TYPE, data); \
- STORE = storage; \
- }
- APT_INRELEASE(MIXED, "Suite", FileI->Archive)
- APT_INRELEASE(MIXED, "Component", FileI->Component)
- APT_INRELEASE(VERSIONNUMBER, "Version", FileI->Version)
- APT_INRELEASE(MIXED, "Origin", FileI->Origin)
- APT_INRELEASE(MIXED, "Codename", FileI->Codename)
- APT_INRELEASE(MIXED, "Label", FileI->Label)
- #undef APT_INRELEASE
- Section.FindFlag("NotAutomatic", FileI->Flags, pkgCache::Flag::NotAutomatic);
- Section.FindFlag("ButAutomaticUpgrades", FileI->Flags, pkgCache::Flag::ButAutomaticUpgrades);
-
- return !_error->PendingError();
-}
- /*}}}*/
// ListParser::GetPrio - Convert the priority from a string /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -992,7 +963,7 @@ unsigned char debListParser::GetPrio(string Str)
return Out;
}
/*}}}*/
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+#if APT_PKG_ABI >= 413
bool debListParser::SameVersion(unsigned short const Hash, /*{{{*/
pkgCache::VerIterator const &Ver)
{
diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index f20f7f33e..420d5ff08 100644
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -26,7 +26,7 @@
class FileFd;
-class debListParser : public pkgCacheGenerator::ListParser
+class APT_HIDDEN debListParser : public pkgCacheGenerator::ListParser
{
public:
@@ -59,7 +59,7 @@ class debListParser : public pkgCacheGenerator::ListParser
public:
- static unsigned char GetPrio(std::string Str);
+ APT_PUBLIC static unsigned char GetPrio(std::string Str);
// These all operate against the current section
virtual std::string Package();
@@ -71,7 +71,7 @@ class debListParser : public pkgCacheGenerator::ListParser
virtual std::vector<std::string> AvailableDescriptionLanguages();
virtual MD5SumValue Description_md5();
virtual unsigned short VersionHash();
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+#if APT_PKG_ABI >= 413
virtual bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver);
#endif
virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
@@ -80,30 +80,30 @@ class debListParser : public pkgCacheGenerator::ListParser
virtual map_filesize_t Size() {return Section.size();};
virtual bool Step();
-
- bool LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,FileFd &File,
- std::string section);
- static const char *ParseDepends(const char *Start,const char *Stop,
+ bool LoadReleaseInfo(pkgCache::RlsFileIterator &FileI,FileFd &File,
+ std::string const &section);
+
+ APT_PUBLIC static const char *ParseDepends(const char *Start,const char *Stop,
std::string &Package,std::string &Ver,unsigned int &Op);
- static const char *ParseDepends(const char *Start,const char *Stop,
+ APT_PUBLIC static const char *ParseDepends(const char *Start,const char *Stop,
std::string &Package,std::string &Ver,unsigned int &Op,
bool const &ParseArchFlags);
- static const char *ParseDepends(const char *Start,const char *Stop,
+ APT_PUBLIC static const char *ParseDepends(const char *Start,const char *Stop,
std::string &Package,std::string &Ver,unsigned int &Op,
bool const &ParseArchFlags, bool const &StripMultiArch);
- static const char *ParseDepends(const char *Start,const char *Stop,
+ APT_PUBLIC static const char *ParseDepends(const char *Start,const char *Stop,
std::string &Package,std::string &Ver,unsigned int &Op,
bool const &ParseArchFlags, bool const &StripMultiArch,
bool const &ParseRestrictionsList);
- static const char *ConvertRelation(const char *I,unsigned int &Op);
+ APT_PUBLIC static const char *ConvertRelation(const char *I,unsigned int &Op);
debListParser(FileFd *File, std::string const &Arch = "");
virtual ~debListParser();
};
-class debDebFileParser : public debListParser
+class APT_HIDDEN debDebFileParser : public debListParser
{
private:
std::string DebFile;
@@ -114,7 +114,7 @@ class debDebFileParser : public debListParser
pkgCache::VerIterator &Ver);
};
-class debTranslationsParser : public debListParser
+class APT_HIDDEN debTranslationsParser : public debListParser
{
public:
// a translation can never be a real package
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index c103da8f7..34fc98838 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -1,5 +1,6 @@
#include <config.h>
+#include <apt-pkg/error.h>
#include <apt-pkg/debmetaindex.h>
#include <apt-pkg/debindexfile.h>
#include <apt-pkg/strutl.h>
@@ -10,10 +11,12 @@
#include <apt-pkg/indexrecords.h>
#include <apt-pkg/sourcelist.h>
#include <apt-pkg/hashes.h>
-#include <apt-pkg/macros.h>
#include <apt-pkg/metaindex.h>
+#include <apt-pkg/pkgcachegen.h>
+#include <apt-pkg/tagfile.h>
+#include <apt-pkg/gpgv.h>
+#include <apt-pkg/macros.h>
-#include <string.h>
#include <map>
#include <string>
#include <utility>
@@ -21,30 +24,16 @@
#include <set>
#include <algorithm>
-using namespace std;
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <string.h>
-string debReleaseIndex::Info(const char *Type, string const &Section, string const &Arch) const
-{
- string Info = ::URI::SiteOnly(URI) + ' ';
- if (Dist[Dist.size() - 1] == '/')
- {
- if (Dist != "/")
- Info += Dist;
- }
- else
- {
- Info += Dist + '/' + Section;
- if (Arch.empty() != true)
- Info += " " + Arch;
- }
- Info += " ";
- Info += Type;
- return Info;
-}
+using namespace std;
string debReleaseIndex::MetaIndexInfo(const char *Type) const
{
- string Info = ::URI::SiteOnly(URI) + ' ';
+ string Info = ::URI::ArchiveOnly(URI) + ' ';
if (Dist[Dist.size() - 1] == '/')
{
if (Dist != "/")
@@ -56,6 +45,10 @@ string debReleaseIndex::MetaIndexInfo(const char *Type) const
Info += Type;
return Info;
}
+std::string debReleaseIndex::Describe() const
+{
+ return MetaIndexInfo("Release");
+}
string debReleaseIndex::MetaIndexFile(const char *Type) const
{
@@ -78,7 +71,6 @@ string debReleaseIndex::MetaIndexURI(const char *Type) const
return Res;
}
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
std::string debReleaseIndex::LocalFileName() const
{
// see if we have a InRelease file
@@ -92,167 +84,183 @@ std::string debReleaseIndex::LocalFileName() const
return "";
}
-#endif
-string debReleaseIndex::IndexURISuffix(const char *Type, string const &Section, string const &Arch) const
-{
- string Res ="";
- if (Dist[Dist.size() - 1] != '/')
- {
- if (Arch == "native")
- Res += Section + "/binary-" + _config->Find("APT::Architecture") + '/';
- else
- Res += Section + "/binary-" + Arch + '/';
- }
- return Res + Type;
+debReleaseIndex::debReleaseIndex(string const &URI, string const &Dist) :
+ metaIndex(URI, Dist, "deb"), Trusted(CHECK_TRUST)
+{}
+
+debReleaseIndex::debReleaseIndex(string const &URI, string const &Dist, bool const Trusted) :
+ metaIndex(URI, Dist, "deb") {
+ SetTrusted(Trusted);
+}
+
+debReleaseIndex::~debReleaseIndex() {
+ for (map<string, vector<debSectionEntry const*> >::const_iterator A = ArchEntries.begin();
+ A != ArchEntries.end(); ++A)
+ for (vector<const debSectionEntry *>::const_iterator S = A->second.begin();
+ S != A->second.end(); ++S)
+ delete *S;
}
-
-string debReleaseIndex::IndexURI(const char *Type, string const &Section, string const &Arch) const
+template<typename CallC>
+void foreachTarget(std::string const URI, std::string const Dist,
+ std::map<std::string, std::vector<debReleaseIndex::debSectionEntry const *> > const &ArchEntries,
+ CallC &Call)
{
- if (Dist[Dist.size() - 1] == '/')
+ bool const flatArchive = (Dist[Dist.length() - 1] == '/');
+ std::string baseURI = URI;
+ if (flatArchive)
{
- string Res;
if (Dist != "/")
- Res = URI + Dist;
- else
- Res = URI;
- return Res + Type;
+ baseURI += Dist;
}
else
- return URI + "dists/" + Dist + '/' + IndexURISuffix(Type, Section, Arch);
- }
+ baseURI += "dists/" + Dist + "/";
+ std::string const Release = (Dist == "/") ? "" : Dist;
+ std::string const Site = ::URI::ArchiveOnly(URI);
+ std::vector<std::string> lang = APT::Configuration::getLanguages(true);
+ if (lang.empty())
+ lang.push_back("none");
+ map<string, vector<debReleaseIndex::debSectionEntry const*> >::const_iterator const src = ArchEntries.find("source");
+ if (src != ArchEntries.end())
+ {
+ std::vector<std::string> const targets = _config->FindVector("APT::Acquire::Targets::deb-src", "", true);
+ for (std::vector<std::string>::const_iterator T = targets.begin(); T != targets.end(); ++T)
+ {
+#define APT_T_CONFIG(X) _config->Find(std::string("APT::Acquire::Targets::deb-src::") + *T + "::" + (X))
+ std::string const MetaKey = APT_T_CONFIG(flatArchive ? "flatMetaKey" : "MetaKey");
+ std::string const ShortDesc = APT_T_CONFIG("ShortDescription");
+ std::string const LongDesc = APT_T_CONFIG(flatArchive ? "flatDescription" : "Description");
+ bool const IsOptional = _config->FindB(std::string("APT::Acquire::Targets::deb-src::") + *T + "::Optional", true);
+#undef APT_T_CONFIG
+ if (MetaKey.empty())
+ continue;
-string debReleaseIndex::SourceIndexURISuffix(const char *Type, const string &Section) const
-{
- string Res ="";
- if (Dist[Dist.size() - 1] != '/')
- Res += Section + "/source/";
- return Res + Type;
-}
+ vector<debReleaseIndex::debSectionEntry const*> const SectionEntries = src->second;
+ for (vector<debReleaseIndex::debSectionEntry const*>::const_iterator I = SectionEntries.begin();
+ I != SectionEntries.end(); ++I)
+ {
+ for (vector<std::string>::const_iterator l = lang.begin(); l != lang.end(); ++l)
+ {
+ if (*l == "none" && MetaKey.find("$(LANGUAGE)") != std::string::npos)
+ continue;
+
+ std::map<std::string, std::string> Options;
+ Options.insert(std::make_pair("SITE", Site));
+ Options.insert(std::make_pair("RELEASE", Release));
+ if (MetaKey.find("$(COMPONENT)") != std::string::npos)
+ Options.insert(std::make_pair("COMPONENT", (*I)->Section));
+ if (MetaKey.find("$(LANGUAGE)") != std::string::npos)
+ Options.insert(std::make_pair("LANGUAGE", *l));
+ Options.insert(std::make_pair("ARCHITECTURE", "source"));
+ Options.insert(std::make_pair("BASE_URI", baseURI));
+ Options.insert(std::make_pair("REPO_URI", URI));
+ Options.insert(std::make_pair("TARGET_OF", "deb-src"));
+ Options.insert(std::make_pair("CREATED_BY", *T));
+ Call(MetaKey, ShortDesc, LongDesc, IsOptional, Options);
+
+ if (MetaKey.find("$(LANGUAGE)") == std::string::npos)
+ break;
+ }
-string debReleaseIndex::SourceIndexURI(const char *Type, const string &Section) const
-{
- string Res;
- if (Dist[Dist.size() - 1] == '/')
+ if (MetaKey.find("$(COMPONENT)") == std::string::npos)
+ break;
+ }
+ }
+ }
+
+ std::vector<std::string> const targets = _config->FindVector("APT::Acquire::Targets::deb", "", true);
+ for (std::vector<std::string>::const_iterator T = targets.begin(); T != targets.end(); ++T)
{
- if (Dist != "/")
- Res = URI + Dist;
- else
- Res = URI;
- return Res + Type;
+#define APT_T_CONFIG(X) _config->Find(std::string("APT::Acquire::Targets::deb::") + *T + "::" + (X))
+ std::string const MetaKey = APT_T_CONFIG(flatArchive ? "flatMetaKey" : "MetaKey");
+ std::string const ShortDesc = APT_T_CONFIG("ShortDescription");
+ std::string const LongDesc = APT_T_CONFIG(flatArchive ? "flatDescription" : "Description");
+ bool const IsOptional = _config->FindB(std::string("APT::Acquire::Targets::deb::") + *T + "::Optional", true);
+#undef APT_T_CONFIG
+ if (MetaKey.empty())
+ continue;
+
+ for (map<string, vector<debReleaseIndex::debSectionEntry const*> >::const_iterator a = ArchEntries.begin();
+ a != ArchEntries.end(); ++a)
+ {
+ if (a->first == "source")
+ continue;
+
+ for (vector <const debReleaseIndex::debSectionEntry *>::const_iterator I = a->second.begin();
+ I != a->second.end(); ++I) {
+
+ for (vector<std::string>::const_iterator l = lang.begin(); l != lang.end(); ++l)
+ {
+ if (*l == "none" && MetaKey.find("$(LANGUAGE)") != std::string::npos)
+ continue;
+
+ std::map<std::string, std::string> Options;
+ Options.insert(std::make_pair("SITE", Site));
+ Options.insert(std::make_pair("RELEASE", Release));
+ if (MetaKey.find("$(COMPONENT)") != std::string::npos)
+ Options.insert(std::make_pair("COMPONENT", (*I)->Section));
+ if (MetaKey.find("$(LANGUAGE)") != std::string::npos)
+ Options.insert(std::make_pair("LANGUAGE", *l));
+ if (MetaKey.find("$(ARCHITECTURE)") != std::string::npos)
+ Options.insert(std::make_pair("ARCHITECTURE", a->first));
+ Options.insert(std::make_pair("BASE_URI", baseURI));
+ Options.insert(std::make_pair("REPO_URI", URI));
+ Options.insert(std::make_pair("TARGET_OF", "deb"));
+ Options.insert(std::make_pair("CREATED_BY", *T));
+ Call(MetaKey, ShortDesc, LongDesc, IsOptional, Options);
+
+ if (MetaKey.find("$(LANGUAGE)") == std::string::npos)
+ break;
+ }
+
+ if (MetaKey.find("$(COMPONENT)") == std::string::npos)
+ break;
+ }
+
+ if (MetaKey.find("$(ARCHITECTURE)") == std::string::npos)
+ break;
+ }
}
- else
- return URI + "dists/" + Dist + "/" + SourceIndexURISuffix(Type, Section);
}
-string debReleaseIndex::TranslationIndexURISuffix(const char *Type, const string &Section) const
-{
- string Res ="";
- if (Dist[Dist.size() - 1] != '/')
- Res += Section + "/i18n/Translation-";
- return Res + Type;
-}
-string debReleaseIndex::TranslationIndexURI(const char *Type, const string &Section) const
+struct ComputeIndexTargetsClass
{
- string Res;
- if (Dist[Dist.size() - 1] == '/')
+ vector <IndexTarget> IndexTargets;
+
+ void operator()(std::string MetaKey, std::string ShortDesc, std::string LongDesc,
+ bool const IsOptional, std::map<std::string, std::string> Options)
{
- if (Dist != "/")
- Res = URI + Dist;
- else
- Res = URI;
- return Res + Type;
+ for (std::map<std::string, std::string>::const_iterator O = Options.begin(); O != Options.end(); ++O)
+ {
+ MetaKey = SubstVar(MetaKey, std::string("$(") + O->first + ")", O->second);
+ ShortDesc = SubstVar(ShortDesc, std::string("$(") + O->first + ")", O->second);
+ LongDesc = SubstVar(LongDesc, std::string("$(") + O->first + ")", O->second);
+ }
+ IndexTarget Target(
+ MetaKey,
+ ShortDesc,
+ LongDesc,
+ Options.find("BASE_URI")->second + MetaKey,
+ IsOptional,
+ Options
+ );
+ IndexTargets.push_back(Target);
}
- else
- return URI + "dists/" + Dist + "/" + TranslationIndexURISuffix(Type, Section);
-}
-
-debReleaseIndex::debReleaseIndex(string const &URI, string const &Dist) :
- metaIndex(URI, Dist, "deb"), Trusted(CHECK_TRUST)
-{}
+};
-debReleaseIndex::debReleaseIndex(string const &URI, string const &Dist, bool const Trusted) :
- metaIndex(URI, Dist, "deb") {
- SetTrusted(Trusted);
+std::vector<IndexTarget> debReleaseIndex::GetIndexTargets() const
+{
+ ComputeIndexTargetsClass comp;
+ foreachTarget(URI, Dist, ArchEntries, comp);
+ return comp.IndexTargets;
}
-debReleaseIndex::~debReleaseIndex() {
- for (map<string, vector<debSectionEntry const*> >::const_iterator A = ArchEntries.begin();
- A != ArchEntries.end(); ++A)
- for (vector<const debSectionEntry *>::const_iterator S = A->second.begin();
- S != A->second.end(); ++S)
- delete *S;
-}
-vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
- vector <IndexTarget *>* IndexTargets = new vector <IndexTarget *>;
-
- map<string, vector<debSectionEntry const*> >::const_iterator const src = ArchEntries.find("source");
- if (src != ArchEntries.end()) {
- vector<debSectionEntry const*> const SectionEntries = src->second;
- for (vector<debSectionEntry const*>::const_iterator I = SectionEntries.begin();
- I != SectionEntries.end(); ++I) {
- IndexTarget * Target = new IndexTarget();
- Target->ShortDesc = "Sources";
- Target->MetaKey = SourceIndexURISuffix(Target->ShortDesc.c_str(), (*I)->Section);
- Target->URI = SourceIndexURI(Target->ShortDesc.c_str(), (*I)->Section);
- Target->Description = Info (Target->ShortDesc.c_str(), (*I)->Section);
- IndexTargets->push_back (Target);
- }
- }
-
- // Only source release
- if (IndexTargets->empty() == false && ArchEntries.size() == 1)
- return IndexTargets;
-
- std::set<std::string> sections;
- for (map<string, vector<debSectionEntry const*> >::const_iterator a = ArchEntries.begin();
- a != ArchEntries.end(); ++a) {
- if (a->first == "source")
- continue;
- for (vector <const debSectionEntry *>::const_iterator I = a->second.begin();
- I != a->second.end(); ++I) {
- IndexTarget * Target = new IndexTarget();
- Target->ShortDesc = "Packages";
- Target->MetaKey = IndexURISuffix(Target->ShortDesc.c_str(), (*I)->Section, a->first);
- Target->URI = IndexURI(Target->ShortDesc.c_str(), (*I)->Section, a->first);
- Target->Description = Info (Target->ShortDesc.c_str(), (*I)->Section, a->first);
- IndexTargets->push_back (Target);
- sections.insert((*I)->Section);
- }
- }
-
- std::vector<std::string> lang = APT::Configuration::getLanguages(true);
- std::vector<std::string>::iterator lend = std::remove(lang.begin(), lang.end(), "none");
- if (lend != lang.end())
- lang.erase(lend);
-
- if (lang.empty() == true)
- return IndexTargets;
-
- // get the Translation-* files, later we will skip download of non-existent if we have an index
- for (std::set<std::string>::const_iterator s = sections.begin();
- s != sections.end(); ++s) {
- for (std::vector<std::string>::const_iterator l = lang.begin();
- l != lang.end(); ++l) {
- IndexTarget * Target = new OptionalIndexTarget();
- Target->ShortDesc = "Translation-" + *l;
- Target->MetaKey = TranslationIndexURISuffix(l->c_str(), *s);
- Target->URI = TranslationIndexURI(l->c_str(), *s);
- Target->Description = Info (Target->ShortDesc.c_str(), *s);
- IndexTargets->push_back(Target);
- }
- }
-
- return IndexTargets;
-}
/*}}}*/
bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
{
- bool const tryInRelease = _config->FindB("Acquire::TryInRelease", true);
-
indexRecords * const iR = new indexRecords(Dist);
if (Trusted == ALWAYS_TRUSTED)
iR->SetTrusted(true);
@@ -260,37 +268,17 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
iR->SetTrusted(false);
// special case for --print-uris
- if (GetAll) {
- vector <IndexTarget *> *targets = ComputeIndexTargets();
- for (vector <IndexTarget*>::const_iterator Target = targets->begin(); Target != targets->end(); ++Target) {
- new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description,
- (*Target)->ShortDesc, HashStringList());
- }
- delete targets;
-
- // this is normally created in pkgAcqMetaSig, but if we run
- // in --print-uris mode, we add it here
- if (tryInRelease == false)
- new pkgAcqMetaIndex(Owner, NULL,
- MetaIndexURI("Release"),
- MetaIndexInfo("Release"), "Release",
- MetaIndexURI("Release.gpg"), MetaIndexInfo("Release.gpg"), "Release.gpg",
- ComputeIndexTargets(),
- iR);
+ std::vector<IndexTarget> const targets = GetIndexTargets();
+#define APT_TARGET(X) IndexTarget("", X, MetaIndexInfo(X), MetaIndexURI(X), false, std::map<std::string,std::string>())
+ pkgAcqMetaBase * const TransactionManager = new pkgAcqMetaClearSig(Owner,
+ APT_TARGET("InRelease"), APT_TARGET("Release"), APT_TARGET("Release.gpg"),
+ targets, iR);
+#undef APT_TARGET
+ if (GetAll)
+ {
+ for (std::vector<IndexTarget>::const_iterator Target = targets.begin(); Target != targets.end(); ++Target)
+ new pkgAcqIndex(Owner, TransactionManager, *Target);
}
- if (tryInRelease == true)
- new pkgAcqMetaClearSig(Owner,
- MetaIndexURI("InRelease"), MetaIndexInfo("InRelease"), "InRelease",
- MetaIndexURI("Release"), MetaIndexInfo("Release"), "Release",
- MetaIndexURI("Release.gpg"), MetaIndexInfo("Release.gpg"), "Release.gpg",
- ComputeIndexTargets(),
- iR);
- else
- new pkgAcqMetaIndex(Owner, NULL,
- MetaIndexURI("Release"), MetaIndexInfo("Release"), "Release",
- MetaIndexURI("Release.gpg"), MetaIndexInfo("Release.gpg"), "Release.gpg",
- ComputeIndexTargets(),
- iR);
return true;
}
@@ -327,45 +315,25 @@ bool debReleaseIndex::IsTrusted() const
return FileExists(VerifiedSigFile);
}
-vector <pkgIndexFile *> *debReleaseIndex::GetIndexFiles() {
- if (Indexes != NULL)
- return Indexes;
-
- Indexes = new vector <pkgIndexFile*>;
- map<string, vector<debSectionEntry const*> >::const_iterator const src = ArchEntries.find("source");
- if (src != ArchEntries.end()) {
- vector<debSectionEntry const*> const SectionEntries = src->second;
- for (vector<debSectionEntry const*>::const_iterator I = SectionEntries.begin();
- I != SectionEntries.end(); ++I)
- Indexes->push_back(new debSourcesIndex (URI, Dist, (*I)->Section, IsTrusted()));
- }
-
- // Only source release
- if (Indexes->empty() == false && ArchEntries.size() == 1)
- return Indexes;
-
- std::vector<std::string> const lang = APT::Configuration::getLanguages(true);
- map<string, set<string> > sections;
- for (map<string, vector<debSectionEntry const*> >::const_iterator a = ArchEntries.begin();
- a != ArchEntries.end(); ++a) {
- if (a->first == "source")
- continue;
- for (vector<debSectionEntry const*>::const_iterator I = a->second.begin();
- I != a->second.end(); ++I) {
- Indexes->push_back(new debPackagesIndex (URI, Dist, (*I)->Section, IsTrusted(), a->first));
- sections[(*I)->Section].insert(lang.begin(), lang.end());
- }
- }
-
- for (map<string, set<string> >::const_iterator s = sections.begin();
- s != sections.end(); ++s)
- for (set<string>::const_iterator l = s->second.begin();
- l != s->second.end(); ++l) {
- if (*l == "none") continue;
- Indexes->push_back(new debTranslationsIndex(URI,Dist,s->first,(*l).c_str()));
- }
-
- return Indexes;
+std::vector <pkgIndexFile *> *debReleaseIndex::GetIndexFiles()
+{
+ if (Indexes != NULL)
+ return Indexes;
+
+ Indexes = new std::vector<pkgIndexFile*>();
+ std::vector<IndexTarget> const Targets = GetIndexTargets();
+ bool const istrusted = IsTrusted();
+ for (std::vector<IndexTarget>::const_iterator T = Targets.begin(); T != Targets.end(); ++T)
+ {
+ std::string const TargetName = T->Option(IndexTarget::CREATED_BY);
+ if (TargetName == "Packages")
+ Indexes->push_back(new debPackagesIndex(*T, istrusted));
+ else if (TargetName == "Sources")
+ Indexes->push_back(new debSourcesIndex(*T, istrusted));
+ else if (TargetName == "Translations")
+ Indexes->push_back(new debTranslationsIndex(*T));
+ }
+ return Indexes;
}
void debReleaseIndex::PushSectionEntry(vector<string> const &Archs, const debSectionEntry *Entry) {
@@ -379,22 +347,121 @@ void debReleaseIndex::PushSectionEntry(string const &Arch, const debSectionEntry
ArchEntries[Arch].push_back(Entry);
}
-void debReleaseIndex::PushSectionEntry(const debSectionEntry *Entry) {
- if (Entry->IsSrc == true)
- PushSectionEntry("source", Entry);
- else {
- for (map<string, vector<const debSectionEntry *> >::iterator a = ArchEntries.begin();
- a != ArchEntries.end(); ++a) {
- a->second.push_back(Entry);
- }
- }
-}
-
debReleaseIndex::debSectionEntry::debSectionEntry (string const &Section,
bool const &IsSrc): Section(Section), IsSrc(IsSrc)
{}
-class debSLTypeDebian : public pkgSourceList::Type
+static bool ReleaseFileName(debReleaseIndex const * const That, std::string &ReleaseFile)
+{
+ ReleaseFile = That->MetaIndexFile("InRelease");
+ bool releaseExists = false;
+ if (FileExists(ReleaseFile) == true)
+ releaseExists = true;
+ else
+ {
+ ReleaseFile = That->MetaIndexFile("Release");
+ if (FileExists(ReleaseFile))
+ releaseExists = true;
+ }
+ return releaseExists;
+}
+
+bool debReleaseIndex::Merge(pkgCacheGenerator &Gen,OpProgress * /*Prog*/) const/*{{{*/
+{
+ std::string ReleaseFile;
+ bool const releaseExists = ReleaseFileName(this, ReleaseFile);
+
+ ::URI Tmp(URI);
+ if (Gen.SelectReleaseFile(ReleaseFile, Tmp.Host) == false)
+ return _error->Error("Problem with SelectReleaseFile %s", ReleaseFile.c_str());
+
+ if (releaseExists == false)
+ return true;
+
+ FileFd Rel;
+ // Beware: The 'Release' file might be clearsigned in case the
+ // signature for an 'InRelease' file couldn't be checked
+ if (OpenMaybeClearSignedFile(ReleaseFile, Rel) == false)
+ return false;
+ if (_error->PendingError() == true)
+ return false;
+
+ // Store the IMS information
+ pkgCache::RlsFileIterator File = Gen.GetCurRlsFile();
+ pkgCacheGenerator::Dynamic<pkgCache::RlsFileIterator> DynFile(File);
+ // Rel can't be used as this is potentially a temporary file
+ struct stat Buf;
+ if (stat(ReleaseFile.c_str(), &Buf) != 0)
+ return _error->Errno("fstat", "Unable to stat file %s", ReleaseFile.c_str());
+ File->Size = Buf.st_size;
+ File->mtime = Buf.st_mtime;
+
+ pkgTagFile TagFile(&Rel, Rel.Size());
+ pkgTagSection Section;
+ if (_error->PendingError() == true || TagFile.Step(Section) == false)
+ return false;
+
+ std::string data;
+ #define APT_INRELEASE(TYPE, TAG, STORE) \
+ data = Section.FindS(TAG); \
+ if (data.empty() == false) \
+ { \
+ map_stringitem_t const storage = Gen.StoreString(pkgCacheGenerator::TYPE, data); \
+ STORE = storage; \
+ }
+ APT_INRELEASE(MIXED, "Suite", File->Archive)
+ APT_INRELEASE(VERSIONNUMBER, "Version", File->Version)
+ APT_INRELEASE(MIXED, "Origin", File->Origin)
+ APT_INRELEASE(MIXED, "Codename", File->Codename)
+ APT_INRELEASE(MIXED, "Label", File->Label)
+ #undef APT_INRELEASE
+ Section.FindFlag("NotAutomatic", File->Flags, pkgCache::Flag::NotAutomatic);
+ Section.FindFlag("ButAutomaticUpgrades", File->Flags, pkgCache::Flag::ButAutomaticUpgrades);
+
+ return !_error->PendingError();
+}
+ /*}}}*/
+// ReleaseIndex::FindInCache - Find this index /*{{{*/
+pkgCache::RlsFileIterator debReleaseIndex::FindInCache(pkgCache &Cache, bool const ModifyCheck) const
+{
+ std::string ReleaseFile;
+ bool const releaseExists = ReleaseFileName(this, ReleaseFile);
+
+ pkgCache::RlsFileIterator File = Cache.RlsFileBegin();
+ for (; File.end() == false; ++File)
+ {
+ if (File->FileName == 0 || ReleaseFile != File.FileName())
+ continue;
+
+ // empty means the file does not exist by "design"
+ if (ModifyCheck == false || (releaseExists == false && File->Size == 0))
+ return File;
+
+ struct stat St;
+ if (stat(File.FileName(),&St) != 0)
+ {
+ if (_config->FindB("Debug::pkgCacheGen", false))
+ std::clog << "ReleaseIndex::FindInCache - stat failed on " << File.FileName() << std::endl;
+ return pkgCache::RlsFileIterator(Cache);
+ }
+ if ((unsigned)St.st_size != File->Size || St.st_mtime != File->mtime)
+ {
+ if (_config->FindB("Debug::pkgCacheGen", false))
+ std::clog << "ReleaseIndex::FindInCache - size (" << St.st_size << " <> " << File->Size
+ << ") or mtime (" << St.st_mtime << " <> " << File->mtime
+ << ") doesn't match for " << File.FileName() << std::endl;
+ return pkgCache::RlsFileIterator(Cache);
+ }
+ return File;
+ }
+
+ return File;
+}
+ /*}}}*/
+
+debDebFileMetaIndex::~debDebFileMetaIndex() {}
+
+class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type
{
protected:
@@ -404,9 +471,12 @@ class debSLTypeDebian : public pkgSourceList::Type
{
// parse arch=, arch+= and arch-= settings
map<string, string>::const_iterator arch = Options.find("arch");
- vector<string> Archs =
- (arch != Options.end()) ? VectorizeString(arch->second, ',') :
- APT::Configuration::getArchitectures();
+ vector<string> Archs;
+ if (arch != Options.end())
+ Archs = VectorizeString(arch->second, ',');
+ else
+ Archs = APT::Configuration::getArchitectures();
+
if ((arch = Options.find("arch+")) != Options.end())
{
std::vector<std::string> const plusArch = VectorizeString(arch->second, ',');
@@ -427,6 +497,7 @@ class debSLTypeDebian : public pkgSourceList::Type
map<string, string>::const_iterator const trusted = Options.find("trusted");
+ debReleaseIndex *Deb = NULL;
for (vector<metaIndex *>::const_iterator I = List.begin();
I != List.end(); ++I)
{
@@ -434,34 +505,23 @@ class debSLTypeDebian : public pkgSourceList::Type
if (strcmp((*I)->GetType(), "deb") != 0)
continue;
- debReleaseIndex *Deb = (debReleaseIndex *) (*I);
- if (trusted != Options.end())
- Deb->SetTrusted(StringToBool(trusted->second, false));
-
/* This check insures that there will be only one Release file
queued for all the Packages files and Sources files it
corresponds to. */
- if (Deb->GetURI() == URI && Deb->GetDist() == Dist)
+ if ((*I)->GetURI() == URI && (*I)->GetDist() == Dist)
{
- if (IsSrc == true)
- Deb->PushSectionEntry("source", new debReleaseIndex::debSectionEntry(Section, IsSrc));
- else
- {
- if (Dist[Dist.size() - 1] == '/')
- Deb->PushSectionEntry("any", new debReleaseIndex::debSectionEntry(Section, IsSrc));
- else
- Deb->PushSectionEntry(Archs, new debReleaseIndex::debSectionEntry(Section, IsSrc));
- }
- return true;
+ Deb = dynamic_cast<debReleaseIndex*>(*I);
+ if (Deb != NULL)
+ break;
}
}
// No currently created Release file indexes this entry, so we create a new one.
- debReleaseIndex *Deb;
- if (trusted != Options.end())
- Deb = new debReleaseIndex(URI, Dist, StringToBool(trusted->second, false));
- else
+ if (Deb == NULL)
+ {
Deb = new debReleaseIndex(URI, Dist);
+ List.push_back(Deb);
+ }
if (IsSrc == true)
Deb->PushSectionEntry ("source", new debReleaseIndex::debSectionEntry(Section, IsSrc));
@@ -472,7 +532,10 @@ class debSLTypeDebian : public pkgSourceList::Type
else
Deb->PushSectionEntry (Archs, new debReleaseIndex::debSectionEntry(Section, IsSrc));
}
- List.push_back(Deb);
+
+ if (trusted != Options.end())
+ Deb->SetTrusted(StringToBool(trusted->second, false));
+
return true;
}
};
@@ -486,7 +549,7 @@ debDebFileMetaIndex::debDebFileMetaIndex(std::string const &DebFile)
}
-class debSLTypeDeb : public debSLTypeDebian
+class APT_HIDDEN debSLTypeDeb : public debSLTypeDebian
{
public:
@@ -504,7 +567,7 @@ class debSLTypeDeb : public debSLTypeDebian
}
};
-class debSLTypeDebSrc : public debSLTypeDebian
+class APT_HIDDEN debSLTypeDebSrc : public debSLTypeDebian
{
public:
@@ -522,7 +585,7 @@ class debSLTypeDebSrc : public debSLTypeDebian
}
};
-class debSLTypeDebFile : public pkgSourceList::Type
+class APT_HIDDEN debSLTypeDebFile : public pkgSourceList::Type
{
public:
@@ -541,6 +604,7 @@ class debSLTypeDebFile : public pkgSourceList::Type
Label = "Debian Deb File";
}
};
-debSLTypeDeb _apt_DebType;
-debSLTypeDebSrc _apt_DebSrcType;
-debSLTypeDebFile _apt_DebFileType;
+
+APT_HIDDEN debSLTypeDeb _apt_DebType;
+APT_HIDDEN debSLTypeDebSrc _apt_DebSrcType;
+APT_HIDDEN debSLTypeDebFile _apt_DebFileType;
diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index 399543953..f2706e08a 100644
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -20,8 +20,10 @@ class pkgAcquire;
class pkgIndexFile;
class debDebPkgFileIndex;
class IndexTarget;
+class pkgCacheGenerator;
+class OpProgress;
-class debReleaseIndex : public metaIndex {
+class APT_HIDDEN debReleaseIndex : public metaIndex {
public:
class debSectionEntry
@@ -46,23 +48,21 @@ class debReleaseIndex : public metaIndex {
virtual std::string ArchiveURI(std::string const &File) const {return URI + File;};
virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const;
- std::vector <IndexTarget *>* ComputeIndexTargets() const;
- std::string Info(const char *Type, std::string const &Section, std::string const &Arch="") const;
+ virtual std::vector<IndexTarget> GetIndexTargets() const;
+
+ virtual std::string Describe() const;
+ virtual pkgCache::RlsFileIterator FindInCache(pkgCache &Cache, bool const ModifyCheck) const;
+ virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
std::string MetaIndexInfo(const char *Type) const;
std::string MetaIndexFile(const char *Types) const;
std::string MetaIndexURI(const char *Type) const;
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
- virtual std::string LocalFileName() const;
+#if APT_PKG_ABI >= 413
+ virtual
#endif
+ std::string LocalFileName() const;
- std::string IndexURI(const char *Type, std::string const &Section, std::string const &Arch="native") const;
- std::string IndexURISuffix(const char *Type, std::string const &Section, std::string const &Arch="native") const;
- std::string SourceIndexURI(const char *Type, const std::string &Section) const;
- std::string SourceIndexURISuffix(const char *Type, const std::string &Section) const;
- std::string TranslationIndexURI(const char *Type, const std::string &Section) const;
- std::string TranslationIndexURISuffix(const char *Type, const std::string &Section) const;
virtual std::vector <pkgIndexFile *> *GetIndexFiles();
void SetTrusted(bool const Trusted);
@@ -70,12 +70,12 @@ class debReleaseIndex : public metaIndex {
void PushSectionEntry(std::vector<std::string> const &Archs, const debSectionEntry *Entry);
void PushSectionEntry(std::string const &Arch, const debSectionEntry *Entry);
- void PushSectionEntry(const debSectionEntry *Entry);
};
-class debDebFileMetaIndex : public metaIndex
+class APT_HIDDEN debDebFileMetaIndex : public metaIndex
{
private:
+ void *d;
std::string DebFile;
debDebPkgFileIndex *DebIndex;
public:
@@ -85,6 +85,9 @@ class debDebFileMetaIndex : public metaIndex
virtual bool GetIndexes(pkgAcquire* /*Owner*/, const bool& /*GetAll=false*/) const {
return true;
}
+ virtual std::vector<IndexTarget> GetIndexTargets() const {
+ return std::vector<IndexTarget>();
+ }
virtual std::vector<pkgIndexFile *> *GetIndexFiles() {
return Indexes;
}
@@ -92,7 +95,7 @@ class debDebFileMetaIndex : public metaIndex
return true;
}
debDebFileMetaIndex(std::string const &DebFile);
- virtual ~debDebFileMetaIndex() {};
+ virtual ~debDebFileMetaIndex();
};
diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index b41aa5584..f527042e4 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -11,35 +11,35 @@
#include <config.h>
#include <apt-pkg/debrecords.h>
+#include <apt-pkg/debindexfile.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/cacheiterators.h>
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/tagfile.h>
+#include <apt-pkg/error.h>
#include <string.h>
#include <algorithm>
+#include <sstream>
#include <string>
#include <vector>
#include <langinfo.h>
+
+#include <apti18n.h>
/*}}}*/
using std::string;
// RecordParser::debRecordParser - Constructor /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-debRecordParser::debRecordParser(string FileName,pkgCache &Cache) :
- File(FileName,FileFd::ReadOnly, FileFd::Extension),
- Tags(&File, std::max(Cache.Head().MaxVerFileSize,
- Cache.Head().MaxDescFileSize) + 200)
+debRecordParser::debRecordParser(string FileName,pkgCache &Cache) :
+ debRecordParserBase(), File(FileName, FileFd::ReadOnly, FileFd::Extension),
+ Tags(&File, std::max(Cache.Head().MaxVerFileSize, Cache.Head().MaxDescFileSize) + 200)
{
}
/*}}}*/
// RecordParser::Jump - Jump to a specific record /*{{{*/
-// ---------------------------------------------------------------------
-/* */
bool debRecordParser::Jump(pkgCache::VerFileIterator const &Ver)
{
return Tags.Jump(Section,Ver->Offset);
@@ -49,32 +49,29 @@ bool debRecordParser::Jump(pkgCache::DescFileIterator const &Desc)
return Tags.Jump(Section,Desc->Offset);
}
/*}}}*/
-// RecordParser::FileName - Return the archive filename on the site /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debRecordParser::FileName()
+debRecordParser::~debRecordParser() {}
+
+debRecordParserBase::debRecordParserBase() : Parser() {}
+// RecordParserBase::FileName - Return the archive filename on the site /*{{{*/
+string debRecordParserBase::FileName()
{
return Section.FindS("Filename");
}
/*}}}*/
-// RecordParser::Name - Return the package name /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debRecordParser::Name()
+// RecordParserBase::Name - Return the package name /*{{{*/
+string debRecordParserBase::Name()
{
return Section.FindS("Package");
}
/*}}}*/
-// RecordParser::Homepage - Return the package homepage /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debRecordParser::Homepage()
+// RecordParserBase::Homepage - Return the package homepage /*{{{*/
+string debRecordParserBase::Homepage()
{
return Section.FindS("Homepage");
}
/*}}}*/
-// RecordParser::Hashes - return the available archive hashes /*{{{*/
-HashStringList debRecordParser::Hashes() const
+// RecordParserBase::Hashes - return the available archive hashes /*{{{*/
+HashStringList debRecordParserBase::Hashes() const
{
HashStringList hashes;
for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type)
@@ -86,27 +83,20 @@ HashStringList debRecordParser::Hashes() const
return hashes;
}
/*}}}*/
-// RecordParser::Maintainer - Return the maintainer email /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debRecordParser::Maintainer()
+// RecordParserBase::Maintainer - Return the maintainer email /*{{{*/
+string debRecordParserBase::Maintainer()
{
return Section.FindS("Maintainer");
}
/*}}}*/
-// RecordParser::RecordField - Return the value of an arbitrary field /*{{*/
-// ---------------------------------------------------------------------
-/* */
-string debRecordParser::RecordField(const char *fieldName)
+// RecordParserBase::RecordField - Return the value of an arbitrary field /*{{*/
+string debRecordParserBase::RecordField(const char *fieldName)
{
return Section.FindS(fieldName);
}
-
- /*}}}*/
-// RecordParser::ShortDesc - Return a 1 line description /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debRecordParser::ShortDesc(std::string const &lang)
+ /*}}}*/
+// RecordParserBase::ShortDesc - Return a 1 line description /*{{{*/
+string debRecordParserBase::ShortDesc(std::string const &lang)
{
string const Res = LongDesc(lang);
if (Res.empty() == true)
@@ -117,10 +107,8 @@ string debRecordParser::ShortDesc(std::string const &lang)
return string(Res,0,Pos);
}
/*}}}*/
-// RecordParser::LongDesc - Return a longer description /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debRecordParser::LongDesc(std::string const &lang)
+// RecordParserBase::LongDesc - Return a longer description /*{{{*/
+string debRecordParserBase::LongDesc(std::string const &lang)
{
string orig;
if (lang.empty() == true)
@@ -162,12 +150,9 @@ string debRecordParser::LongDesc(std::string const &lang)
}
/*}}}*/
-static const char *SourceVerSeparators = " ()";
-
-// RecordParser::SourcePkg - Return the source package name if any /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debRecordParser::SourcePkg()
+static const char * const SourceVerSeparators = " ()";
+// RecordParserBase::SourcePkg - Return the source package name if any /*{{{*/
+string debRecordParserBase::SourcePkg()
{
string Res = Section.FindS("Source");
string::size_type Pos = Res.find_first_of(SourceVerSeparators);
@@ -176,10 +161,8 @@ string debRecordParser::SourcePkg()
return string(Res,0,Pos);
}
/*}}}*/
-// RecordParser::SourceVer - Return the source version number if present /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debRecordParser::SourceVer()
+// RecordParserBase::SourceVer - Return the source version number if present /*{{{*/
+string debRecordParserBase::SourceVer()
{
string Pkg = Section.FindS("Source");
string::size_type Pos = Pkg.find_first_of(SourceVerSeparators);
@@ -199,13 +182,35 @@ string debRecordParser::SourceVer()
return string(Pkg, VerStart, VerEnd - VerStart);
}
/*}}}*/
-// RecordParser::GetRec - Return the whole record /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void debRecordParser::GetRec(const char *&Start,const char *&Stop)
+// RecordParserBase::GetRec - Return the whole record /*{{{*/
+void debRecordParserBase::GetRec(const char *&Start,const char *&Stop)
{
Section.GetSection(Start,Stop);
}
/*}}}*/
+debRecordParserBase::~debRecordParserBase() {}
-debRecordParser::~debRecordParser() {}
+bool debDebFileRecordParser::LoadContent()
+{
+ // load content only once
+ if (controlContent.empty() == false)
+ return true;
+
+ std::ostringstream content;
+ if (debDebPkgFileIndex::GetContent(content, debFileName) == false)
+ return false;
+ // add two newlines to make sure the scanner finds the section,
+ // which is usually done by pkgTagFile automatically if needed.
+ content << "\n\n";
+
+ controlContent = content.str();
+ if (Section.Scan(controlContent.c_str(), controlContent.length()) == false)
+ return _error->Error(_("Unable to parse package file %s (%d)"), debFileName.c_str(), 3);
+ return true;
+}
+bool debDebFileRecordParser::Jump(pkgCache::VerFileIterator const &) { return LoadContent(); }
+bool debDebFileRecordParser::Jump(pkgCache::DescFileIterator const &) { return LoadContent(); }
+std::string debDebFileRecordParser::FileName() { return debFileName; }
+
+debDebFileRecordParser::debDebFileRecordParser(std::string FileName) : debRecordParserBase(), debFileName(FileName) {}
+debDebFileRecordParser::~debDebFileRecordParser() {}
diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index 6b5f94334..8efcec8cd 100644
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -25,21 +25,13 @@
#include <apt-pkg/indexfile.h>
#endif
-class debRecordParser : public pkgRecords::Parser
+class APT_HIDDEN debRecordParserBase : public pkgRecords::Parser
{
- /** \brief dpointer placeholder (for later in case we need it) */
void *d;
-
protected:
- FileFd File;
- pkgTagFile Tags;
pkgTagSection Section;
-
- virtual bool Jump(pkgCache::VerFileIterator const &Ver);
- virtual bool Jump(pkgCache::DescFileIterator const &Desc);
-
- public:
+ public:
// These refer to the archive file for the Version
virtual std::string FileName();
virtual std::string SourcePkg();
@@ -58,20 +50,44 @@ class debRecordParser : public pkgRecords::Parser
virtual std::string RecordField(const char *fieldName);
virtual void GetRec(const char *&Start,const char *&Stop);
-
+
+ debRecordParserBase();
+ virtual ~debRecordParserBase();
+};
+
+class APT_HIDDEN debRecordParser : public debRecordParserBase
+{
+ void *d;
+ protected:
+ FileFd File;
+ pkgTagFile Tags;
+
+ virtual bool Jump(pkgCache::VerFileIterator const &Ver);
+ virtual bool Jump(pkgCache::DescFileIterator const &Desc);
+
+ public:
debRecordParser(std::string FileName,pkgCache &Cache);
virtual ~debRecordParser();
};
// custom record parser that reads deb files directly
-class debDebFileRecordParser : public debRecordParser
+class APT_HIDDEN debDebFileRecordParser : public debRecordParserBase
{
+ void *d;
+ std::string debFileName;
+ std::string controlContent;
+
+ APT_HIDDEN bool LoadContent();
+ protected:
+ // single file files, so no jumping whatsoever
+ bool Jump(pkgCache::VerFileIterator const &);
+ bool Jump(pkgCache::DescFileIterator const &);
+
public:
- virtual std::string FileName() {
- return File.Name();
- }
- debDebFileRecordParser(std::string FileName,pkgCache &Cache)
- : debRecordParser(FileName, Cache) {};
+ virtual std::string FileName();
+
+ debDebFileRecordParser(std::string FileName);
+ virtual ~debDebFileRecordParser();
};
#endif
diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index 97f43aca2..21a4ff8ea 100644
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -32,6 +32,10 @@
using std::max;
using std::string;
+debSrcRecordParser::debSrcRecordParser(std::string const &File,pkgIndexFile const *Index)
+ : Parser(Index), Fd(File,FileFd::ReadOnly, FileFd::Extension), Tags(&Fd,102400),
+ iOffset(0), Buffer(NULL) {}
+
// SrcRecordParser::Binaries - Return the binaries field /*{{{*/
// ---------------------------------------------------------------------
/* This member parses the binaries field into a pair of class arrays and
@@ -121,9 +125,32 @@ bool debSrcRecordParser::BuildDepends(std::vector<pkgSrcRecords::Parser::BuildDe
// ---------------------------------------------------------------------
/* This parses the list of files and returns it, each file is required to have
a complete source package */
-bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &List)
+bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &F)
+{
+ std::vector<pkgSrcRecords::File2> F2;
+ if (Files2(F2) == false)
+ return false;
+ for (std::vector<pkgSrcRecords::File2>::const_iterator f2 = F2.begin(); f2 != F2.end(); ++f2)
+ {
+ pkgSrcRecords::File2 f;
+#if __GNUC__ >= 4
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+ f.MD5Hash = f2->MD5Hash;
+ f.Size = f2->Size;
+#if __GNUC__ >= 4
+ #pragma GCC diagnostic pop
+#endif
+ f.Path = f2->Path;
+ f.Type = f2->Type;
+ F.push_back(f);
+ }
+ return true;
+}
+bool debSrcRecordParser::Files2(std::vector<pkgSrcRecords::File2> &List)
{
- List.erase(List.begin(),List.end());
+ List.clear();
// Stash the / terminated directory prefix
string Base = Sect.FindS("Directory");
@@ -162,7 +189,7 @@ bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &List)
path = Base + path;
// look if we have a record for this file already
- std::vector<pkgSrcRecords::File>::iterator file = List.begin();
+ std::vector<pkgSrcRecords::File2>::iterator file = List.begin();
for (; file != List.end(); ++file)
if (file->Path == path)
break;
@@ -170,16 +197,8 @@ bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &List)
// we have it already, store the new hash and be done
if (file != List.end())
{
-#if __GNUC__ >= 4
- // set for compatibility only, so warn users not us
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
if (checksumField == "Files")
- file->MD5Hash = hash;
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+ APT_IGNORE_DEPRECATED(file->MD5Hash = hash;)
// an error here indicates that we have two different hashes for the same file
if (file->Hashes.push_back(hashString) == false)
return _error->Error("Error parsing checksum in %s of source package %s", checksumField.c_str(), Package().c_str());
@@ -187,21 +206,16 @@ bool debSrcRecordParser::Files(std::vector<pkgSrcRecords::File> &List)
}
// we haven't seen this file yet
- pkgSrcRecords::File F;
+ pkgSrcRecords::File2 F;
F.Path = path;
- F.Size = strtoull(size.c_str(), NULL, 10);
+ F.FileSize = strtoull(size.c_str(), NULL, 10);
F.Hashes.push_back(hashString);
-#if __GNUC__ >= 4
- // set for compatibility only, so warn users not us
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+ APT_IGNORE_DEPRECATED_PUSH
+ F.Size = F.FileSize;
if (checksumField == "Files")
F.MD5Hash = hash;
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+ APT_IGNORE_DEPRECATED_POP
// Try to guess what sort of file it is we are getting.
string::size_type Pos = F.Path.length()-1;
diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h
index a0a151875..7aeb2db88 100644
--- a/apt-pkg/deb/debsrcrecords.h
+++ b/apt-pkg/deb/debsrcrecords.h
@@ -21,7 +21,7 @@
class pkgIndexFile;
-class debSrcRecordParser : public pkgSrcRecords::Parser
+class APT_HIDDEN debSrcRecordParser : public pkgSrcRecords::Parser
{
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
@@ -54,14 +54,13 @@ class debSrcRecordParser : public pkgSrcRecords::Parser
return std::string(Start,Stop);
};
virtual bool Files(std::vector<pkgSrcRecords::File> &F);
+ bool Files2(std::vector<pkgSrcRecords::File2> &F);
- debSrcRecordParser(std::string const &File,pkgIndexFile const *Index)
- : Parser(Index), Fd(File,FileFd::ReadOnly, FileFd::Extension), Tags(&Fd,102400),
- iOffset(0), Buffer(NULL) {}
+ debSrcRecordParser(std::string const &File,pkgIndexFile const *Index);
virtual ~debSrcRecordParser();
};
-class debDscRecordParser : public debSrcRecordParser
+class APT_HIDDEN debDscRecordParser : public debSrcRecordParser
{
public:
debDscRecordParser(std::string const &DscFile, pkgIndexFile const *Index);
diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index 142f3a6e6..9a5da9da1 100644
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -38,7 +38,7 @@ using std::string;
debSystem debSys;
-class debSystemPrivate {
+class APT_HIDDEN debSystemPrivate {
public:
debSystemPrivate() : LockFD(-1), LockCount(0), StatusFile(0)
{
diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h
index 434ff4a2e..7befe6372 100644
--- a/apt-pkg/deb/debversion.h
+++ b/apt-pkg/deb/debversion.h
@@ -1,6 +1,5 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: debversion.h,v 1.3 2001/05/03 05:25:04 jgg Exp $
/* ######################################################################
Debian Version - Versioning system for Debian
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 0cded32e1..6ee939edd 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -72,7 +72,9 @@ class pkgDPkgPMPrivate
public:
pkgDPkgPMPrivate() : stdin_is_dev_null(false), dpkgbuf_pos(0),
term_out(NULL), history_out(NULL),
- progress(NULL), master(-1), slave(NULL)
+ progress(NULL), tt_is_valid(false), master(-1),
+ slave(NULL), protect_slave_from_dying(-1),
+ direct_stdin(false)
{
dpkgbuf[0] = '\0';
}
@@ -90,13 +92,16 @@ public:
// pty stuff
struct termios tt;
+ bool tt_is_valid;
int master;
char * slave;
+ int protect_slave_from_dying;
// signals
sigset_t sigmask;
sigset_t original_sigmask;
+ bool direct_stdin;
};
namespace
@@ -198,18 +203,12 @@ pkgCache::VerIterator FindNowVersion(const pkgCache::PkgIterator &Pkg)
{
pkgCache::VerIterator Ver;
for (Ver = Pkg.VersionList(); Ver.end() == false; ++Ver)
- {
- pkgCache::VerFileIterator Vf = Ver.FileList();
- pkgCache::PkgFileIterator F = Vf.File();
- for (F = Vf.File(); F.end() == false; ++F)
- {
- if (F && F.Archive())
- {
- if (strcmp(F.Archive(), "now"))
- return Ver;
- }
- }
- }
+ for (pkgCache::VerFileIterator Vf = Ver.FileList(); Vf.end() == false; ++Vf)
+ for (pkgCache::PkgFileIterator F = Vf.File(); F.end() == false; ++F)
+ {
+ if (F.Archive() != 0 && strcmp(F.Archive(), "now") == 0)
+ return Ver;
+ }
return Ver;
}
/*}}}*/
@@ -1044,6 +1043,12 @@ void pkgDPkgPM::BuildPackagesProgressMap()
PackagesTotal++;
}
}
+ /* one extra: We don't want the progress bar to reach 100%, especially not
+ if we call dpkg --configure --pending and process a bunch of triggers
+ while showing 100%. Also, spindown takes a while, so never reaching 100%
+ is way more correct than reaching 100% while still doing stuff even if
+ doing it this way is slightly bending the rules */
+ ++PackagesTotal;
}
/*}}}*/
bool pkgDPkgPM::Go(int StatusFd)
@@ -1068,48 +1073,44 @@ void pkgDPkgPM::StartPtyMagic()
return;
}
+ if (isatty(STDIN_FILENO) == 0)
+ d->direct_stdin = true;
+
_error->PushToStack();
- // if tcgetattr for both stdin/stdout returns 0 (no error)
- // we do the pty magic
- if (tcgetattr(STDOUT_FILENO, &d->tt) == 0 &&
- tcgetattr(STDIN_FILENO, &d->tt) == 0)
+
+ d->master = posix_openpt(O_RDWR | O_NOCTTY);
+ if (d->master == -1)
+ _error->Errno("posix_openpt", _("Can not write log (%s)"), _("Is /dev/pts mounted?"));
+ else if (unlockpt(d->master) == -1)
+ _error->Errno("unlockpt", "Unlocking the slave of master fd %d failed!", d->master);
+ else
{
- d->master = posix_openpt(O_RDWR | O_NOCTTY);
- if (d->master == -1)
- _error->Errno("posix_openpt", _("Can not write log (%s)"), _("Is /dev/pts mounted?"));
- else if (unlockpt(d->master) == -1)
- {
- _error->Errno("unlockpt", "Unlocking the slave of master fd %d failed!", d->master);
- close(d->master);
- d->master = -1;
- }
+ char const * const slave_name = ptsname(d->master);
+ if (slave_name == NULL)
+ _error->Errno("ptsname", "Getting name for slave of master fd %d failed!", d->master);
else
{
- char const * const slave_name = ptsname(d->master);
- if (slave_name == NULL)
- {
- _error->Errno("unlockpt", "Getting name for slave of master fd %d failed!", d->master);
- close(d->master);
- d->master = -1;
- }
- else
+ d->slave = strdup(slave_name);
+ if (d->slave == NULL)
+ _error->Errno("strdup", "Copying name %s for slave of master fd %d failed!", slave_name, d->master);
+ else if (grantpt(d->master) == -1)
+ _error->Errno("grantpt", "Granting access to slave %s based on master fd %d failed!", slave_name, d->master);
+ else if (tcgetattr(STDIN_FILENO, &d->tt) == 0)
{
- d->slave = strdup(slave_name);
- if (d->slave == NULL)
+ d->tt_is_valid = true;
+ struct termios raw_tt;
+ // copy window size of stdout if its a 'good' terminal
+ if (tcgetattr(STDOUT_FILENO, &raw_tt) == 0)
{
- _error->Errno("strdup", "Copying name %s for slave of master fd %d failed!", slave_name, d->master);
- close(d->master);
- d->master = -1;
+ struct winsize win;
+ if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &win) < 0)
+ _error->Errno("ioctl", "Getting TIOCGWINSZ from stdout failed!");
+ if (ioctl(d->master, TIOCSWINSZ, &win) < 0)
+ _error->Errno("ioctl", "Setting TIOCSWINSZ for master fd %d failed!", d->master);
}
- struct winsize win;
- if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &win) < 0)
- _error->Errno("ioctl", "Getting TIOCGWINSZ from stdout failed!");
- if (ioctl(d->master, TIOCSWINSZ, &win) < 0)
- _error->Errno("ioctl", "Setting TIOCSWINSZ for master fd %d failed!", d->master);
if (tcsetattr(d->master, TCSANOW, &d->tt) == -1)
_error->Errno("tcsetattr", "Setting in Start via TCSANOW for master fd %d failed!", d->master);
- struct termios raw_tt;
raw_tt = d->tt;
cfmakeraw(&raw_tt);
raw_tt.c_lflag &= ~ECHO;
@@ -1121,18 +1122,22 @@ void pkgDPkgPM::StartPtyMagic()
sigaddset(&d->sigmask, SIGTTOU);
sigprocmask(SIG_BLOCK,&d->sigmask, &d->original_sigmask);
if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &raw_tt) == -1)
- _error->Errno("tcsetattr", "Setting in Start via TCSAFLUSH for stdout failed!");
+ _error->Errno("tcsetattr", "Setting in Start via TCSAFLUSH for stdin failed!");
sigprocmask(SIG_SETMASK, &d->original_sigmask, NULL);
+
+ }
+ if (d->slave != NULL)
+ {
+ /* on linux, closing (and later reopening) all references to the slave
+ makes the slave a death end, so we open it here to have one open all
+ the time. We could use this fd in SetupSlavePtyMagic() for linux, but
+ on kfreebsd we get an incorrect ("step like") output then while it has
+ no problem with closing all references… so to avoid platform specific
+ code here we combine both and be happy once more */
+ d->protect_slave_from_dying = open(d->slave, O_RDWR | O_CLOEXEC | O_NOCTTY);
}
}
}
- else
- {
- // complain only if stdout is either a terminal (but still failed) or is an invalid
- // descriptor otherwise we would complain about redirection to e.g. /dev/null as well.
- if (isatty(STDOUT_FILENO) == 1 || errno == EBADF)
- _error->Errno("tcgetattr", _("Can not write log (%s)"), _("Is stdout a terminal?"));
- }
if (_error->PendingError() == true)
{
@@ -1141,44 +1146,60 @@ void pkgDPkgPM::StartPtyMagic()
close(d->master);
d->master = -1;
}
+ if (d->slave != NULL)
+ {
+ free(d->slave);
+ d->slave = NULL;
+ }
_error->DumpErrors(std::cerr);
}
_error->RevertToStack();
}
void pkgDPkgPM::SetupSlavePtyMagic()
{
- if(d->master == -1)
+ if(d->master == -1 || d->slave == NULL)
return;
if (close(d->master) == -1)
_error->FatalE("close", "Closing master %d in child failed!", d->master);
+ d->master = -1;
if (setsid() == -1)
_error->FatalE("setsid", "Starting a new session for child failed!");
- int const slaveFd = open(d->slave, O_RDWR);
+ int const slaveFd = open(d->slave, O_RDWR | O_NOCTTY);
if (slaveFd == -1)
_error->FatalE("open", _("Can not write log (%s)"), _("Is /dev/pts mounted?"));
-
- if (ioctl(slaveFd, TIOCSCTTY, 0) < 0)
+ else if (ioctl(slaveFd, TIOCSCTTY, 0) < 0)
_error->FatalE("ioctl", "Setting TIOCSCTTY for slave fd %d failed!", slaveFd);
else
{
- for (unsigned short i = 0; i < 3; ++i)
+ unsigned short i = 0;
+ if (d->direct_stdin == true)
+ ++i;
+ for (; i < 3; ++i)
if (dup2(slaveFd, i) == -1)
_error->FatalE("dup2", "Dupping %d to %d in child failed!", slaveFd, i);
- if (tcsetattr(0, TCSANOW, &d->tt) < 0)
+ if (d->tt_is_valid == true && tcsetattr(STDIN_FILENO, TCSANOW, &d->tt) < 0)
_error->FatalE("tcsetattr", "Setting in Setup via TCSANOW for slave fd %d failed!", slaveFd);
}
+
+ if (slaveFd != -1)
+ close(slaveFd);
}
void pkgDPkgPM::StopPtyMagic()
{
if (d->slave != NULL)
free(d->slave);
d->slave = NULL;
+ if (d->protect_slave_from_dying != -1)
+ {
+ close(d->protect_slave_from_dying);
+ d->protect_slave_from_dying = -1;
+ }
if(d->master >= 0)
{
- if (tcsetattr(0, TCSAFLUSH, &d->tt) == -1)
+ if (d->tt_is_valid == true && tcsetattr(STDIN_FILENO, TCSAFLUSH, &d->tt) == -1)
_error->FatalE("tcsetattr", "Setting in Stop via TCSAFLUSH for stdin failed!");
close(d->master);
d->master = -1;
@@ -1261,9 +1282,8 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
// support subpressing of triggers processing for special
// cases like d-i that runs the triggers handling manually
- bool const SmartConf = (_config->Find("PackageManager::Configure", "all") != "all");
bool const TriggersPending = _config->FindB("DPkg::TriggersPending", false);
- if (_config->FindB("DPkg::ConfigurePending", SmartConf) == true)
+ if (_config->FindB("DPkg::ConfigurePending", true) == true)
List.push_back(Item(Item::ConfigurePending, PkgIterator()));
// for the progress
@@ -1572,8 +1592,8 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
// wait for input or output here
FD_ZERO(&rfds);
- if (d->master >= 0 && !d->stdin_is_dev_null)
- FD_SET(0, &rfds);
+ if (d->master >= 0 && d->direct_stdin == false && d->stdin_is_dev_null == false)
+ FD_SET(STDIN_FILENO, &rfds);
FD_SET(_dpkgin, &rfds);
if(d->master >= 0)
FD_SET(d->master, &rfds);
@@ -1684,7 +1704,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
if (apportPkg.end() == true || apportPkg->CurrentVer == 0)
return;
- string pkgname, reportfile, srcpkgname, pkgver, arch;
+ string pkgname, reportfile, pkgver, arch;
string::size_type pos;
FILE *report;
@@ -1823,7 +1843,16 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
time_t now = time(NULL);
fprintf(report, "Date: %s" , ctime(&now));
fprintf(report, "Package: %s %s\n", pkgname.c_str(), pkgver.c_str());
+#if APT_PKG_ABI >= 413
fprintf(report, "SourcePackage: %s\n", Ver.SourcePkgName());
+#else
+ pkgRecords Recs(Cache);
+ pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList());
+ std::string srcpkgname = Parse.SourcePkg();
+ if(srcpkgname.empty())
+ srcpkgname = pkgname;
+ fprintf(report, "SourcePackage: %s\n", srcpkgname.c_str());
+#endif
fprintf(report, "ErrorMessage:\n %s\n", errormsg);
// ensure that the log is flushed
@@ -1863,8 +1892,15 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
}
}
- // log the ordering
- const char *ops_str[] = {"Install", "Configure","Remove","Purge"};
+ // log the ordering, see dpkgpm.h and the "Ops" enum there
+ const char *ops_str[] = {
+ "Install",
+ "Configure",
+ "Remove",
+ "Purge",
+ "ConfigurePending",
+ "TriggersPending",
+ };
fprintf(report, "AptOrdering:\n");
for (vector<Item>::iterator I = List.begin(); I != List.end(); ++I)
if ((*I).Pkg != NULL)
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 1332f3ee2..36e1ac9ec 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -33,7 +33,6 @@
#include <vector>
#include <algorithm>
#include <iostream>
-#include <sstream>
#include <set>
#include <sys/stat.h>
@@ -237,9 +236,11 @@ bool pkgDepCache::writeStateFile(OpProgress * /*prog*/, bool InstalledOnly) /*{{
FileFd StateFile;
string const state = _config->FindFile("Dir::State::extended_states");
+ if (CreateAPTDirectoryIfNeeded(_config->FindDir("Dir::State"), flNotFile(state)) == false)
+ return false;
// if it does not exist, create a empty one
- if(!RealFileExists(state))
+ if(!RealFileExists(state))
{
StateFile.Open(state, FileFd::WriteAtomic);
StateFile.Close();
@@ -250,17 +251,14 @@ bool pkgDepCache::writeStateFile(OpProgress * /*prog*/, bool InstalledOnly) /*{{
return _error->Error(_("Failed to open StateFile %s"),
state.c_str());
- FILE *OutFile;
- string const outfile = state + ".tmp";
- if((OutFile = fopen(outfile.c_str(),"w")) == NULL)
- return _error->Error(_("Failed to write temporary StateFile %s"),
- outfile.c_str());
+ FileFd OutFile(state, FileFd::ReadWrite | FileFd::Atomic);
+ if (OutFile.IsOpen() == false || OutFile.Failed() == true)
+ return _error->Error(_("Failed to write temporary StateFile %s"), state.c_str());
// first merge with the existing sections
pkgTagFile tagfile(&StateFile);
pkgTagSection section;
std::set<string> pkgs_seen;
- const char *nullreorderlist[] = {0};
while(tagfile.Step(section)) {
string const pkgname = section.FindS("Package");
string pkgarch = section.FindS("Architecture");
@@ -269,7 +267,7 @@ bool pkgDepCache::writeStateFile(OpProgress * /*prog*/, bool InstalledOnly) /*{{
// Silently ignore unknown packages and packages with no actual
// version.
pkgCache::PkgIterator pkg = Cache->FindPkg(pkgname, pkgarch);
- if(pkg.end() || pkg.VersionList().end())
+ if(pkg.end() || pkg.VersionList().end())
continue;
StateCache const &P = PkgState[pkg->ID];
bool newAuto = (P.Flags & Flag::Auto);
@@ -290,21 +288,17 @@ bool pkgDepCache::writeStateFile(OpProgress * /*prog*/, bool InstalledOnly) /*{{
if(_config->FindB("Debug::pkgAutoRemove",false))
std::clog << "Update existing AutoInstall info: "
<< pkg.FullName() << std::endl;
- TFRewriteData rewrite[3];
- rewrite[0].Tag = "Architecture";
- rewrite[0].Rewrite = pkg.Arch();
- rewrite[0].NewTag = 0;
- rewrite[1].Tag = "Auto-Installed";
- rewrite[1].Rewrite = newAuto ? "1" : "0";
- rewrite[1].NewTag = 0;
- rewrite[2].Tag = 0;
- TFRewrite(OutFile, section, nullreorderlist, rewrite);
- fprintf(OutFile,"\n");
+
+ std::vector<pkgTagSection::Tag> rewrite;
+ rewrite.push_back(pkgTagSection::Tag::Rewrite("Architecture", pkg.Arch()));
+ rewrite.push_back(pkgTagSection::Tag::Rewrite("Auto-Installed", newAuto ? "1" : "0"));
+ section.Write(OutFile, NULL, rewrite);
+ if (OutFile.Write("\n", 1) == false)
+ return false;
pkgs_seen.insert(pkg.FullName());
}
-
+
// then write the ones we have not seen yet
- std::ostringstream ostr;
for(pkgCache::PkgIterator pkg=Cache->PkgBegin(); !pkg.end(); ++pkg) {
StateCache const &P = PkgState[pkg->ID];
if(P.Flags & Flag::Auto) {
@@ -323,19 +317,17 @@ bool pkgDepCache::writeStateFile(OpProgress * /*prog*/, bool InstalledOnly) /*{{
continue;
if(debug_autoremove)
std::clog << "Writing new AutoInstall: " << pkg.FullName() << std::endl;
- ostr.str(string(""));
- ostr << "Package: " << pkg.Name()
- << "\nArchitecture: " << pkgarch
- << "\nAuto-Installed: 1\n\n";
- fprintf(OutFile,"%s",ostr.str().c_str());
+ std::string stanza = "Package: ";
+ stanza.append(pkg.Name())
+ .append("\nArchitecture: ").append(pkgarch)
+ .append("\nAuto-Installed: 1\n\n");
+ if (OutFile.Write(stanza.c_str(), stanza.length()) == false)
+ return false;
}
}
- fclose(OutFile);
-
- // move the outfile over the real file and set permissions
- rename(outfile.c_str(), state.c_str());
+ if (OutFile.Close() == false)
+ return false;
chmod(state.c_str(), 0644);
-
return true;
}
/*}}}*/
@@ -1313,14 +1305,18 @@ bool pkgDepCache::IsInstallOkMultiArchSameVersionSynced(PkgIterator const &Pkg,
GrpIterator const Grp = Pkg.Group();
for (PkgIterator P = Grp.PackageList(); P.end() == false; P = Grp.NextPkg(P))
{
- // not installed or version synced: fine by definition
+ // not installed or self-check: fine by definition
+ if (P->CurrentVer == 0 || P == Pkg)
+ continue;
+
+ // not having a candidate or being in sync
// (simple string-compare as stuff like '1' == '0:1-0' can't happen here)
- if (P->CurrentVer == 0 || strcmp(Pkg.CandVersion(), P.CandVersion()) == 0)
+ VerIterator CV = PkgState[P->ID].CandidateVerIter(*this);
+ if (CV.end() == true || strcmp(Pkg.CandVersion(), CV.VerStr()) == 0)
continue;
+
// packages losing M-A:same can be out-of-sync
- VerIterator CV = PkgState[P->ID].CandidateVerIter(*this);
- if (unlikely(CV.end() == true) ||
- (CV->MultiArch & pkgCache::Version::Same) != pkgCache::Version::Same)
+ if ((CV->MultiArch & pkgCache::Version::Same) != pkgCache::Version::Same)
continue;
// not downloadable means the package is obsolete, so allow out-of-sync
@@ -1330,7 +1326,8 @@ bool pkgDepCache::IsInstallOkMultiArchSameVersionSynced(PkgIterator const &Pkg,
PkgState[Pkg->ID].iFlags |= AutoKept;
if (unlikely(DebugMarker == true))
std::clog << OutputInDepth(Depth) << "Ignore MarkInstall of " << Pkg
- << " as its M-A:same siblings are not version-synced" << std::endl;
+ << " as it is not in sync with its M-A:same sibling " << P
+ << " (" << Pkg.CandVersion() << " != " << CV.VerStr() << ")" << std::endl;
return false;
}
@@ -1688,13 +1685,13 @@ pkgCache::VerIterator pkgDepCache::Policy::GetCandidateVer(PkgIterator const &Pk
for (VerFileIterator J = I.FileList(); J.end() == false; ++J)
{
- if ((J.File()->Flags & Flag::NotSource) != 0)
+ if (J.File().Flagged(Flag::NotSource))
continue;
/* Stash the highest version of a not-automatic source, we use it
if there is nothing better */
- if ((J.File()->Flags & Flag::NotAutomatic) != 0 ||
- (J.File()->Flags & Flag::ButAutomaticUpgrades) != 0)
+ if (J.File().Flagged(Flag::NotAutomatic) ||
+ J.File().Flagged(Flag::ButAutomaticUpgrades))
{
if (Last.end() == true)
Last = I;
diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index 5554e1a69..94c1088f2 100644
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -1,6 +1,5 @@
// -*- mode: c++; mode: fold -*-
// Description /*{{{*/
-// $Id: depcache.h,v 1.14 2001/02/20 07:03:17 jgg Exp $
/* ######################################################################
DepCache - Dependency Extension data for the cache
@@ -109,7 +108,7 @@ class pkgDepCache : protected pkgCache::Namespace
*
* \return \b false if an error occurred.
*/
- APT_HIDDEN bool MarkRequired(InRootSetFunc &rootFunc);
+ bool MarkRequired(InRootSetFunc &rootFunc);
/** \brief Set the StateCache::Garbage flag on all packages that
* should be removed.
@@ -120,7 +119,7 @@ class pkgDepCache : protected pkgCache::Namespace
*
* \return \b false if an error occurred.
*/
- APT_HIDDEN bool Sweep();
+ bool Sweep();
public:
@@ -164,6 +163,7 @@ class pkgDepCache : protected pkgCache::Namespace
*/
class ActionGroup
{
+ void *d;
pkgDepCache &cache;
bool released;
@@ -192,7 +192,7 @@ class pkgDepCache : protected pkgCache::Namespace
* If this is the last action group, the automatic cache
* cleanup operations will be undertaken.
*/
- ~ActionGroup();
+ virtual ~ActionGroup();
};
/** \brief Returns \b true for packages matching a regular
@@ -503,6 +503,8 @@ class pkgDepCache : protected pkgCache::Namespace
bool const rPurge, unsigned long const Depth, bool const FromUser);
private:
+ void *d;
+
APT_HIDDEN bool IsModeChangeOk(ModeList const mode, PkgIterator const &Pkg,
unsigned long const Depth, bool const FromUser);
};
diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index 2ba914b16..25d53747c 100644
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -39,64 +39,26 @@
using std::string;
// we could use pkgCache::DepType and ::Priority, but these would be localized strings…
-const char * const EDSP::PrioMap[] = {0, "important", "required", "standard",
+const char * const PrioMap[] = {0, "important", "required", "standard",
"optional", "extra"};
-const char * const EDSP::DepMap[] = {"", "Depends", "Pre-Depends", "Suggests",
+const char * const DepMap[] = {"", "Depends", "Pre-Depends", "Suggests",
"Recommends" , "Conflicts", "Replaces",
"Obsoletes", "Breaks", "Enhances"};
-// EDSP::WriteScenario - to the given file descriptor /*{{{*/
-bool EDSP::WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress)
-{
- if (Progress != NULL)
- Progress->SubProgress(Cache.Head().VersionCount, _("Send scenario to solver"));
- unsigned long p = 0;
- std::vector<std::string> archs = APT::Configuration::getArchitectures();
- for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; ++Pkg)
- {
- std::string const arch = Pkg.Arch();
- if (std::find(archs.begin(), archs.end(), arch) == archs.end())
- continue;
- for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver, ++p)
- {
- WriteScenarioVersion(Cache, output, Pkg, Ver);
- WriteScenarioDependency(output, Ver);
- fprintf(output, "\n");
- if (Progress != NULL && p % 100 == 0)
- Progress->Progress(p);
- }
- }
- return true;
-}
- /*}}}*/
-// EDSP::WriteLimitedScenario - to the given file descriptor /*{{{*/
-bool EDSP::WriteLimitedScenario(pkgDepCache &Cache, FILE* output,
- APT::PackageSet const &pkgset,
- OpProgress *Progress)
-{
- if (Progress != NULL)
- Progress->SubProgress(Cache.Head().VersionCount, _("Send scenario to solver"));
- unsigned long p = 0;
- for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg, ++p)
- for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver)
- {
- WriteScenarioVersion(Cache, output, Pkg, Ver);
- WriteScenarioLimitedDependency(output, Ver, pkgset);
- fprintf(output, "\n");
- if (Progress != NULL && p % 100 == 0)
- Progress->Progress(p);
- }
- if (Progress != NULL)
- Progress->Done();
- return true;
-}
- /*}}}*/
-// EDSP::WriteScenarioVersion /*{{{*/
-void EDSP::WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgIterator const &Pkg,
+
+// WriteScenarioVersion /*{{{*/
+static void WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgIterator const &Pkg,
pkgCache::VerIterator const &Ver)
{
fprintf(output, "Package: %s\n", Pkg.Name());
+#if APT_PKG_ABI >= 413
fprintf(output, "Source: %s\n", Ver.SourcePkgName());
+#else
+ pkgRecords Recs(Cache);
+ pkgRecords::Parser &rec = Recs.Lookup(Ver.FileList());
+ string srcpkg = rec.SourcePkg().empty() ? Pkg.Name() : rec.SourcePkg();
+ fprintf(output, "Source: %s\n", srcpkg.c_str());
+#endif
fprintf(output, "Architecture: %s\n", Ver.Arch());
fprintf(output, "Version: %s\n", Ver.VerStr());
if (Pkg.CurrentVer() == Ver)
@@ -122,7 +84,7 @@ void EDSP::WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgI
signed short const p = Cache.GetPolicy().GetPriority(File);
if (Pin < p)
Pin = p;
- if ((File->Flags & pkgCache::Flag::NotSource) != pkgCache::Flag::NotSource) {
+ if (File.Flagged(pkgCache::Flag::NotSource) == false) {
string Release = File.RelStr();
if (!Release.empty())
Releases.insert(Release);
@@ -140,8 +102,8 @@ void EDSP::WriteScenarioVersion(pkgDepCache &Cache, FILE* output, pkgCache::PkgI
fprintf(output, "APT-Automatic: yes\n");
}
/*}}}*/
-// EDSP::WriteScenarioDependency /*{{{*/
-void EDSP::WriteScenarioDependency( FILE* output, pkgCache::VerIterator const &Ver)
+// WriteScenarioDependency /*{{{*/
+static void WriteScenarioDependency( FILE* output, pkgCache::VerIterator const &Ver)
{
std::string dependencies[pkgCache::Dep::Enhances + 1];
bool orGroup = false;
@@ -176,8 +138,8 @@ void EDSP::WriteScenarioDependency( FILE* output, pkgCache::VerIterator const &V
fprintf(output, "Provides: %s\n", provides.c_str()+2);
}
/*}}}*/
-// EDSP::WriteScenarioLimitedDependency /*{{{*/
-void EDSP::WriteScenarioLimitedDependency(FILE* output,
+// WriteScenarioLimitedDependency /*{{{*/
+static void WriteScenarioLimitedDependency(FILE* output,
pkgCache::VerIterator const &Ver,
APT::PackageSet const &pkgset)
{
@@ -228,6 +190,52 @@ void EDSP::WriteScenarioLimitedDependency(FILE* output,
fprintf(output, "Provides: %s\n", provides.c_str()+2);
}
/*}}}*/
+// EDSP::WriteScenario - to the given file descriptor /*{{{*/
+bool EDSP::WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress)
+{
+ if (Progress != NULL)
+ Progress->SubProgress(Cache.Head().VersionCount, _("Send scenario to solver"));
+ unsigned long p = 0;
+ std::vector<std::string> archs = APT::Configuration::getArchitectures();
+ for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false; ++Pkg)
+ {
+ std::string const arch = Pkg.Arch();
+ if (std::find(archs.begin(), archs.end(), arch) == archs.end())
+ continue;
+ for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver, ++p)
+ {
+ WriteScenarioVersion(Cache, output, Pkg, Ver);
+ WriteScenarioDependency(output, Ver);
+ fprintf(output, "\n");
+ if (Progress != NULL && p % 100 == 0)
+ Progress->Progress(p);
+ }
+ }
+ return true;
+}
+ /*}}}*/
+// EDSP::WriteLimitedScenario - to the given file descriptor /*{{{*/
+bool EDSP::WriteLimitedScenario(pkgDepCache &Cache, FILE* output,
+ APT::PackageSet const &pkgset,
+ OpProgress *Progress)
+{
+ if (Progress != NULL)
+ Progress->SubProgress(Cache.Head().VersionCount, _("Send scenario to solver"));
+ unsigned long p = 0;
+ for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg, ++p)
+ for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; ++Ver)
+ {
+ WriteScenarioVersion(Cache, output, Pkg, Ver);
+ WriteScenarioLimitedDependency(output, Ver, pkgset);
+ fprintf(output, "\n");
+ if (Progress != NULL && p % 100 == 0)
+ Progress->Progress(p);
+ }
+ if (Progress != NULL)
+ Progress->Done();
+ return true;
+}
+ /*}}}*/
// EDSP::WriteRequest - to the given file descriptor /*{{{*/
bool EDSP::WriteRequest(pkgDepCache &Cache, FILE* output, bool const Upgrade,
bool const DistUpgrade, bool const AutoRemove,
@@ -358,13 +366,13 @@ bool EDSP::ReadResponse(int const input, pkgDepCache &Cache, OpProgress *Progres
return true;
}
/*}}}*/
-// EDSP::ReadLine - first line from the given file descriptor /*{{{*/
+// ReadLine - first line from the given file descriptor /*{{{*/
// ---------------------------------------------------------------------
/* Little helper method to read a complete line into a string. Similar to
fgets but we need to use the low-level read() here as otherwise the
listparser will be confused later on as mixing of fgets and read isn't
a supported action according to the manpages and results are undefined */
-bool EDSP::ReadLine(int const input, std::string &line) {
+static bool ReadLine(int const input, std::string &line) {
char one;
ssize_t data = 0;
line.erase();
@@ -383,11 +391,11 @@ bool EDSP::ReadLine(int const input, std::string &line) {
return false;
}
/*}}}*/
-// EDSP::StringToBool - convert yes/no to bool /*{{{*/
+// StringToBool - convert yes/no to bool /*{{{*/
// ---------------------------------------------------------------------
/* we are not as lazy as we are in the global StringToBool as we really
only accept yes/no here - but we will ignore leading spaces */
-bool EDSP::StringToBool(char const *answer, bool const defValue) {
+static bool StringToBool(char const *answer, bool const defValue) {
for (; isspace(*answer) != 0; ++answer);
if (strncasecmp(answer, "yes", 3) == 0)
return true;
@@ -436,11 +444,11 @@ bool EDSP::ReadRequest(int const input, std::list<std::string> &install,
request = &remove;
}
else if (line.compare(0, 8, "Upgrade:") == 0)
- upgrade = EDSP::StringToBool(line.c_str() + 9, false);
+ upgrade = StringToBool(line.c_str() + 9, false);
else if (line.compare(0, 13, "Dist-Upgrade:") == 0)
- distUpgrade = EDSP::StringToBool(line.c_str() + 14, false);
+ distUpgrade = StringToBool(line.c_str() + 14, false);
else if (line.compare(0, 11, "Autoremove:") == 0)
- autoRemove = EDSP::StringToBool(line.c_str() + 12, false);
+ autoRemove = StringToBool(line.c_str() + 12, false);
else if (line.compare(0, 13, "Architecture:") == 0)
_config->Set("APT::Architecture", line.c_str() + 14);
else if (line.compare(0, 14, "Architectures:") == 0)
diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h
index 9e833556a..72b886a31 100644
--- a/apt-pkg/edsp.h
+++ b/apt-pkg/edsp.h
@@ -27,24 +27,8 @@
class pkgDepCache;
class OpProgress;
-class EDSP /*{{{*/
+namespace EDSP /*{{{*/
{
- // we could use pkgCache::DepType and ::Priority, but these would be localized strings…
- static const char * const PrioMap[];
- static const char * const DepMap[];
-
- APT_HIDDEN bool static ReadLine(int const input, std::string &line);
- APT_HIDDEN bool static StringToBool(char const *answer, bool const defValue);
-
- APT_HIDDEN void static WriteScenarioVersion(pkgDepCache &Cache, FILE* output,
- pkgCache::PkgIterator const &Pkg,
- pkgCache::VerIterator const &Ver);
- APT_HIDDEN void static WriteScenarioDependency(FILE* output,
- pkgCache::VerIterator const &Ver);
- APT_HIDDEN void static WriteScenarioLimitedDependency(FILE* output,
- pkgCache::VerIterator const &Ver,
- APT::PackageSet const &pkgset);
-public:
/** \brief creates the EDSP request stanza
*
* In the EDSP protocol the first thing send to the resolver is a stanza
@@ -61,7 +45,7 @@ public:
*
* \return true if request was composed successfully, otherwise false
*/
- bool static WriteRequest(pkgDepCache &Cache, FILE* output,
+ bool WriteRequest(pkgDepCache &Cache, FILE* output,
bool const upgrade = false,
bool const distUpgrade = false,
bool const autoRemove = false,
@@ -84,7 +68,7 @@ public:
*
* \return true if universe was composed successfully, otherwise false
*/
- bool static WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress = NULL);
+ bool WriteScenario(pkgDepCache &Cache, FILE* output, OpProgress *Progress = NULL);
/** \brief creates a limited scenario representing the package universe
*
@@ -101,7 +85,7 @@ public:
*
* \return true if universe was composed successfully, otherwise false
*/
- bool static WriteLimitedScenario(pkgDepCache &Cache, FILE* output,
+ bool WriteLimitedScenario(pkgDepCache &Cache, FILE* output,
APT::PackageSet const &pkgset,
OpProgress *Progress = NULL);
@@ -118,7 +102,7 @@ public:
*
* \return true if a solution is found and applied correctly, otherwise false
*/
- bool static ReadResponse(int const input, pkgDepCache &Cache, OpProgress *Progress = NULL);
+ bool ReadResponse(int const input, pkgDepCache &Cache, OpProgress *Progress = NULL);
/** \brief search and read the request stanza for action later
*
@@ -136,7 +120,7 @@ public:
*
* \return true if the request could be found and worked on, otherwise false
*/
- bool static ReadRequest(int const input, std::list<std::string> &install,
+ bool ReadRequest(int const input, std::list<std::string> &install,
std::list<std::string> &remove, bool &upgrade,
bool &distUpgrade, bool &autoRemove);
@@ -152,7 +136,7 @@ public:
*
* \return false if the request couldn't be applied, true otherwise
*/
- bool static ApplyRequest(std::list<std::string> const &install,
+ bool ApplyRequest(std::list<std::string> const &install,
std::list<std::string> const &remove,
pkgDepCache &Cache);
@@ -168,7 +152,7 @@ public:
*
* \return true if solution could be written, otherwise false
*/
- bool static WriteSolution(pkgDepCache &Cache, FILE* output);
+ bool WriteSolution(pkgDepCache &Cache, FILE* output);
/** \brief sends a progress report
*
@@ -176,7 +160,7 @@ public:
* \param message the solver wants the user to see
* \param output the front-end listens for progress report
*/
- bool static WriteProgress(unsigned short const percent, const char* const message, FILE* output);
+ bool WriteProgress(unsigned short const percent, const char* const message, FILE* output);
/** \brief sends an error report
*
@@ -193,7 +177,7 @@ public:
* \param message is free form text to describe the error
* \param output the front-end listens for error messages
*/
- bool static WriteError(char const * const uuid, std::string const &message, FILE* output);
+ bool WriteError(char const * const uuid, std::string const &message, FILE* output);
/** \brief executes the given solver and returns the pipe ends
@@ -207,8 +191,8 @@ public:
*
* \return PID of the started solver or 0 if failure occurred
*/
- pid_t static ExecuteSolver(const char* const solver, int * const solver_in, int * const solver_out, bool /*overload*/);
- APT_DEPRECATED bool static ExecuteSolver(const char* const solver, int *solver_in, int *solver_out);
+ pid_t ExecuteSolver(const char* const solver, int * const solver_in, int * const solver_out, bool /*overload*/);
+ APT_DEPRECATED bool ExecuteSolver(const char* const solver, int *solver_in, int *solver_out);
/** \brief call an external resolver to handle the request
*
@@ -224,7 +208,7 @@ public:
* \return true if the solver has successfully solved the problem,
* otherwise false
*/
- bool static ResolveExternal(const char* const solver, pkgDepCache &Cache,
+ bool ResolveExternal(const char* const solver, pkgDepCache &Cache,
bool const upgrade, bool const distUpgrade,
bool const autoRemove, OpProgress *Progress = NULL);
};
diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc
index c38f24567..5d9383e94 100644
--- a/apt-pkg/edsp/edspindexfile.cc
+++ b/apt-pkg/edsp/edspindexfile.cc
@@ -49,15 +49,14 @@ bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
if (Prog != NULL)
Prog->SubProgress(0,File);
- if (Gen.SelectFile(File,std::string(),*this) == false)
+ if (Gen.SelectFile(File, *this, "", "edsp") == false)
return _error->Error("Problem with SelectFile %s",File.c_str());
// Store the IMS information
pkgCache::PkgFileIterator CFile = Gen.GetCurFile();
+ pkgCacheGenerator::Dynamic<pkgCache::PkgFileIterator> DynFile(CFile);
CFile->Size = Pkg.FileSize();
CFile->mtime = Pkg.ModificationTime();
- map_stringitem_t const storage = Gen.StoreString(pkgCacheGenerator::MIXED, "edsp::scenario");
- CFile->Archive = storage;
if (Gen.MergeList(Parser) == false)
return _error->Error("Problem with MergeList %s",File.c_str());
@@ -65,7 +64,7 @@ bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
}
/*}}}*/
// Index File types for APT /*{{{*/
-class edspIFType: public pkgIndexFile::Type
+class APT_HIDDEN edspIFType: public pkgIndexFile::Type
{
public:
virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator) const
@@ -75,10 +74,12 @@ class edspIFType: public pkgIndexFile::Type
};
edspIFType() {Label = "EDSP scenario file";};
};
-static edspIFType _apt_Universe;
+APT_HIDDEN edspIFType _apt_Universe;
const pkgIndexFile::Type *edspIndex::GetType() const
{
return &_apt_Universe;
}
/*}}}*/
+
+edspIndex::~edspIndex() {}
diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h
index 609a2cde4..0f63b7b2a 100644
--- a/apt-pkg/edsp/edspindexfile.h
+++ b/apt-pkg/edsp/edspindexfile.h
@@ -18,7 +18,7 @@
class OpProgress;
class pkgCacheGenerator;
-class edspIndex : public debStatusIndex
+class APT_HIDDEN edspIndex : public debStatusIndex
{
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
@@ -30,6 +30,7 @@ class edspIndex : public debStatusIndex
virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
edspIndex(std::string File);
+ virtual ~edspIndex();
};
#endif
diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc
index 212dc7840..d1c0cf7e8 100644
--- a/apt-pkg/edsp/edsplistparser.cc
+++ b/apt-pkg/edsp/edsplistparser.cc
@@ -86,9 +86,11 @@ bool edspListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
}
/*}}}*/
// ListParser::LoadReleaseInfo - Load the release information /*{{{*/
-APT_CONST bool edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator & /*FileI*/,
- FileFd & /*File*/, std::string /*component*/)
+APT_CONST bool edspListParser::LoadReleaseInfo(pkgCache::RlsFileIterator & /*FileI*/,
+ FileFd & /*File*/, std::string const &/*component*/)
{
return true;
}
/*}}}*/
+
+edspListParser::~edspListParser() {}
diff --git a/apt-pkg/edsp/edsplistparser.h b/apt-pkg/edsp/edsplistparser.h
index 959fb587f..ef5179e68 100644
--- a/apt-pkg/edsp/edsplistparser.h
+++ b/apt-pkg/edsp/edsplistparser.h
@@ -25,8 +25,9 @@
class FileFd;
-class edspListParser : public debListParser
+class APT_HIDDEN edspListParser : public debListParser
{
+ void *d;
public:
virtual bool NewVersion(pkgCache::VerIterator &Ver);
virtual std::string Description();
@@ -34,10 +35,11 @@ class edspListParser : public debListParser
virtual MD5SumValue Description_md5();
virtual unsigned short VersionHash();
- bool LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,FileFd &File,
- std::string section);
+ bool LoadReleaseInfo(pkgCache::RlsFileIterator &FileI,FileFd &File,
+ std::string const &section);
edspListParser(FileFd *File, std::string const &Arch = "");
+ virtual ~edspListParser();
protected:
virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc
index 92edb8d77..063517421 100644
--- a/apt-pkg/edsp/edspsystem.cc
+++ b/apt-pkg/edsp/edspsystem.cc
@@ -26,8 +26,6 @@
#include <apti18n.h>
/*}}}*/
-edspSystem edspSys;
-
// System::debSystem - Constructor /*{{{*/
edspSystem::edspSystem()
{
@@ -126,3 +124,5 @@ bool edspSystem::FindIndex(pkgCache::PkgFileIterator File,
return false;
}
/*}}}*/
+
+APT_HIDDEN edspSystem edspSys;
diff --git a/apt-pkg/edsp/edspsystem.h b/apt-pkg/edsp/edspsystem.h
index 65e36d714..1e27d2cb0 100644
--- a/apt-pkg/edsp/edspsystem.h
+++ b/apt-pkg/edsp/edspsystem.h
@@ -22,7 +22,7 @@ class pkgIndexFile;
class pkgPackageManager;
class edspIndex;
-class edspSystem : public pkgSystem
+class APT_HIDDEN edspSystem : public pkgSystem
{
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
@@ -42,9 +42,7 @@ class edspSystem : public pkgSystem
pkgIndexFile *&Found) const;
edspSystem();
- ~edspSystem();
+ virtual ~edspSystem();
};
-extern edspSystem edspSys;
-
#endif
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 5fa57fd8b..120d061ad 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -108,10 +108,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
}
if (_error->PendingError() == true)
return false;
- FILE *TargetFl = fdopen(dup(Target.Fd()),"w");
- if (TargetFl == 0)
- return _error->Errno("fdopen","Failed to reopen fd");
-
+
// Setup the progress meter
if(Progress)
Progress->OverallProgress(CurrentSize,TotalSize,FileSize,
@@ -132,14 +129,11 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
string File;
unsigned long long Size;
if (GetFile(File,Size) == false)
- {
- fclose(TargetFl);
return false;
- }
-
+
if (Chop != 0)
File = OrigPath + ChopDirs(File,Chop);
-
+
// See if the file exists
if (NoStat == false || Hits < 10)
{
@@ -157,10 +151,10 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
if (Chop != 0)
File = OrigPath + ChopDirs(File,Chop);
}
-
+
// Get the size
struct stat Buf;
- if (stat((CDROM + Prefix + File).c_str(),&Buf) != 0 ||
+ if (stat((CDROM + Prefix + File).c_str(),&Buf) != 0 ||
Buf.st_size == 0)
{
bool Mangled = false;
@@ -173,7 +167,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
File.replace(Start,End-Start,"binary-all");
Mangled = true;
}
-
+
if (Mangled == false ||
stat((CDROM + Prefix + File).c_str(),&Buf) != 0)
{
@@ -181,9 +175,9 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
clog << "Missed(2): " << OrigFile << endl;
NotFound++;
continue;
- }
- }
-
+ }
+ }
+
// Size match
if ((unsigned long long)Buf.st_size != Size)
{
@@ -193,21 +187,17 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
continue;
}
}
-
+
Packages++;
Hits++;
-
- if (RewriteEntry(TargetFl,File) == false)
- {
- fclose(TargetFl);
+
+ if (RewriteEntry(Target, File) == false)
return false;
- }
}
- 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
@@ -216,40 +206,40 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
FinalF += URItoFileName(S);
if (rename(TargetF.c_str(),FinalF.c_str()) != 0)
return _error->Errno("rename","Failed to rename");
+ ChangeOwnerAndPermissionOfFile("CopyPackages", FinalF.c_str(), "root", "root", 0644);
}
-
+
/* Mangle the source to be in the proper notation with
- prefix dist [component] */
+ prefix dist [component] */
*I = string(*I,Prefix.length());
ConvertToSourceList(CDROM,*I);
*I = Prefix + ' ' + *I;
-
+
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"),
+ 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"),
+ 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("A lot of entries were discarded, something may be wrong.\n");
-
return true;
}
@@ -266,10 +256,10 @@ string IndexCopy::ChopDirs(string Path,unsigned int Depth)
Depth--;
}
while (I != string::npos && Depth != 0);
-
+
if (I == string::npos)
return string();
-
+
return string(Path,I+1);
}
/*}}}*/
@@ -432,17 +422,15 @@ bool PackageCopy::GetFile(string &File,unsigned long long &Size)
}
/*}}}*/
// PackageCopy::RewriteEntry - Rewrite the entry with a new filename /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool PackageCopy::RewriteEntry(FILE *Target,string File)
+bool PackageCopy::RewriteEntry(FileFd &Target,string const &File)
{
- TFRewriteData Changes[] = {{ "Filename", File.c_str(), NULL },
- { NULL, NULL, NULL }};
-
- if (TFRewrite(Target,*Section,TFRewritePackageOrder,Changes) == false)
+ string const Dir(File,0,File.rfind('/'));
+ std::vector<pkgTagSection::Tag> Changes;
+ Changes.push_back(pkgTagSection::Tag::Rewrite("Filename", File));
+
+ if (Section->Write(Target, TFRewritePackageOrder, Changes) == false)
return false;
- fputc('\n',Target);
- return true;
+ return Target.Write("\n", 1);
}
/*}}}*/
// SourceCopy::GetFile - Get the file information from the section /*{{{*/
@@ -477,23 +465,18 @@ bool SourceCopy::GetFile(string &File,unsigned long long &Size)
}
/*}}}*/
// SourceCopy::RewriteEntry - Rewrite the entry with a new filename /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool SourceCopy::RewriteEntry(FILE *Target,string File)
+bool SourceCopy::RewriteEntry(FileFd &Target, std::string const &File)
{
- string Dir(File,0,File.rfind('/'));
- TFRewriteData Changes[] = {{ "Directory", Dir.c_str(), NULL },
- { NULL, NULL, NULL }};
-
- if (TFRewrite(Target,*Section,TFRewriteSourceOrder,Changes) == false)
+ string const Dir(File,0,File.rfind('/'));
+ std::vector<pkgTagSection::Tag> Changes;
+ Changes.push_back(pkgTagSection::Tag::Rewrite("Directory", Dir));
+
+ if (Section->Write(Target, TFRewriteSourceOrder, Changes) == false)
return false;
- fputc('\n',Target);
- return true;
+ return Target.Write("\n", 1);
}
/*}}}*/
-// SigVerify::Verify - Verify a files md5sum against its metaindex /*{{{*/
-// ---------------------------------------------------------------------
-/* */
+// 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);
@@ -546,8 +529,9 @@ bool SigVerify::CopyMetaIndex(string CDROM, string CDName, /*{{{*/
FileFd Rel;
Target.Open(TargetF,FileFd::WriteAtomic);
Rel.Open(prefix + file,FileFd::ReadOnly);
- if (CopyFile(Rel,Target) == false)
+ if (CopyFile(Rel,Target) == false || Target.Close() == false)
return _error->Error("Copying of '%s' for '%s' from '%s' failed", file.c_str(), CDName.c_str(), prefix.c_str());
+ ChangeOwnerAndPermissionOfFile("CopyPackages", TargetF.c_str(), "root", "root", 0644);
return true;
}
@@ -700,7 +684,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/
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(),
@@ -717,10 +701,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/
}
if (_error->PendingError() == true)
return false;
- FILE *TargetFl = fdopen(dup(Target.Fd()),"w");
- if (TargetFl == 0)
- return _error->Errno("fdopen","Failed to reopen fd");
-
+
// Setup the progress meter
if(Progress)
Progress->OverallProgress(CurrentSize,TotalSize,FileSize,
@@ -738,20 +719,16 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/
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);
+ if (Section.Write(Target) == false || Target.Write("\n", 1) == false)
+ return false;
Packages++;
Hits++;
}
- fclose(TargetFl);
if (Debug == true)
cout << " Processed by using Prefix '" << Prefix << "' and chop " << endl;
-
+
if (_config->FindB("APT::CDROM::NoAct",false) == false)
{
// Move out of the partial directory
@@ -760,38 +737,47 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/
FinalF += URItoFileName(S);
if (rename(TargetF.c_str(),FinalF.c_str()) != 0)
return _error->Errno("rename","Failed to rename");
+ ChangeOwnerAndPermissionOfFile("CopyTranslations", FinalF.c_str(), "root", "root", 0644);
}
-
-
+
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"),
+ 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"),
+ 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("A lot of entries were discarded, something may be wrong.\n");
-
return true;
}
/*}}}*/
+IndexCopy::IndexCopy() {}
APT_CONST IndexCopy::~IndexCopy() {}
+
+PackageCopy::PackageCopy() : IndexCopy() {}
+APT_CONST PackageCopy::~PackageCopy() {}
+SourceCopy::SourceCopy() : IndexCopy() {}
+APT_CONST SourceCopy::~SourceCopy() {}
+TranslationsCopy::TranslationsCopy() {}
+APT_CONST TranslationsCopy::~TranslationsCopy() {}
+SigVerify::SigVerify() {}
+APT_CONST SigVerify::~SigVerify() {}
diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index 701beb075..7ee162542 100644
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -1,6 +1,5 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: indexcopy.h,v 1.3 2001/05/27 04:46:54 jgg Exp $
/* ######################################################################
Index Copying - Aid for copying and verifying the index files
@@ -28,6 +27,7 @@ using std::vector;
class pkgTagSection;
class indexRecords;
class pkgCdromStatus;
+class FileFd;
class IndexCopy /*{{{*/
{
@@ -45,7 +45,7 @@ class IndexCopy /*{{{*/
void ConvertToSourceList(std::string CD,std::string &Path);
bool GrabFirst(std::string Path,std::string &To,unsigned int Depth);
virtual bool GetFile(std::string &Filename,unsigned long long &Size) = 0;
- virtual bool RewriteEntry(FILE *Target,std::string File) = 0;
+ virtual bool RewriteEntry(FileFd &Target, std::string const &File) = 0;
virtual const char *GetFileName() = 0;
virtual const char *Type() = 0;
@@ -53,39 +53,52 @@ class IndexCopy /*{{{*/
bool CopyPackages(std::string CDROM,std::string Name,std::vector<std::string> &List,
pkgCdromStatus *log);
+ IndexCopy();
virtual ~IndexCopy();
};
/*}}}*/
class PackageCopy : public IndexCopy /*{{{*/
{
+ void *d;
protected:
-
+
virtual bool GetFile(std::string &Filename,unsigned long long &Size);
- virtual bool RewriteEntry(FILE *Target,std::string File);
+ virtual bool RewriteEntry(FileFd &Target, std::string const &File);
virtual const char *GetFileName() {return "Packages";};
virtual const char *Type() {return "Package";};
-
+
+ public:
+ PackageCopy();
+ virtual ~PackageCopy();
};
/*}}}*/
class SourceCopy : public IndexCopy /*{{{*/
{
+ void *d;
protected:
virtual bool GetFile(std::string &Filename,unsigned long long &Size);
- virtual bool RewriteEntry(FILE *Target,std::string File);
+ virtual bool RewriteEntry(FileFd &Target, std::string const &File);
virtual const char *GetFileName() {return "Sources";};
virtual const char *Type() {return "Source";};
-
+
+ public:
+ SourceCopy();
+ virtual ~SourceCopy();
};
/*}}}*/
class TranslationsCopy /*{{{*/
{
+ void *d;
protected:
pkgTagSection *Section;
public:
bool CopyTranslations(std::string CDROM,std::string Name,std::vector<std::string> &List,
pkgCdromStatus *log);
+
+ TranslationsCopy();
+ virtual ~TranslationsCopy();
};
/*}}}*/
class SigVerify /*{{{*/
@@ -105,6 +118,9 @@ class SigVerify /*{{{*/
int const &statusfd, int fd[2]);
APT_DEPRECATED static bool RunGPGV(std::string const &File, std::string const &FileOut,
int const &statusfd = -1);
+
+ SigVerify();
+ virtual ~SigVerify();
};
/*}}}*/
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index 89615cb41..b3c5cf229 100644
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -10,8 +10,10 @@
// Include Files /*{{{*/
#include<config.h>
+#include <apt-pkg/configuration.h>
#include <apt-pkg/indexfile.h>
#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/cacheiterators.h>
@@ -50,25 +52,24 @@ pkgIndexFile::Type *pkgIndexFile::Type::GetType(const char *Type)
return 0;
}
/*}}}*/
+pkgIndexFile::pkgIndexFile(bool Trusted) : /*{{{*/
+ Trusted(Trusted)
+{
+}
+ /*}}}*/
// IndexFile::ArchiveInfo - Stub /*{{{*/
-// ---------------------------------------------------------------------
-/* */
std::string pkgIndexFile::ArchiveInfo(pkgCache::VerIterator /*Ver*/) const
{
return std::string();
}
/*}}}*/
// IndexFile::FindInCache - Stub /*{{{*/
-// ---------------------------------------------------------------------
-/* */
pkgCache::PkgFileIterator pkgIndexFile::FindInCache(pkgCache &Cache) const
{
return pkgCache::PkgFileIterator(Cache);
}
/*}}}*/
// IndexFile::SourceIndex - Stub /*{{{*/
-// ---------------------------------------------------------------------
-/* */
std::string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &/*Record*/,
pkgSrcRecords::File const &/*File*/) const
{
@@ -110,3 +111,122 @@ APT_DEPRECATED std::string pkgIndexFile::LanguageCode() {
return APT::Configuration::getLanguages()[0];
}
/*}}}*/
+
+// IndexTarget - Constructor /*{{{*/
+IndexTarget::IndexTarget(std::string const &MetaKey, std::string const &ShortDesc,
+ std::string const &LongDesc, std::string const &URI, bool const IsOptional,
+ std::map<std::string, std::string> const &Options) :
+ URI(URI), Description(LongDesc), ShortDesc(ShortDesc), MetaKey(MetaKey), IsOptional(IsOptional), Options(Options)
+{
+}
+ /*}}}*/
+std::string IndexTarget::Option(OptionKeys const EnumKey) const /*{{{*/
+{
+ std::string Key;
+ switch (EnumKey)
+ {
+#define APT_CASE(X) case X: Key = #X; break
+ APT_CASE(SITE);
+ APT_CASE(RELEASE);
+ APT_CASE(COMPONENT);
+ APT_CASE(LANGUAGE);
+ APT_CASE(ARCHITECTURE);
+ APT_CASE(BASE_URI);
+ APT_CASE(REPO_URI);
+ APT_CASE(TARGET_OF);
+ APT_CASE(CREATED_BY);
+#undef APT_CASE
+ case FILENAME: return _config->FindDir("Dir::State::lists") + URItoFileName(URI);
+ case EXISTING_FILENAME:
+ std::string const filename = Option(FILENAME);
+ std::vector<std::string> const types = APT::Configuration::getCompressionTypes();
+ for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t)
+ {
+ if (t->empty())
+ continue;
+ std::string const file = (*t == "uncompressed") ? filename : (filename + "." + *t);
+ if (FileExists(file))
+ return file;
+ }
+ return "";
+ }
+ std::map<std::string,std::string>::const_iterator const M = Options.find(Key);
+ if (M == Options.end())
+ return "";
+ return M->second;
+}
+ /*}}}*/
+std::string IndexTarget::Format(std::string format) const /*{{{*/
+{
+ for (std::map<std::string, std::string>::const_iterator O = Options.begin(); O != Options.end(); ++O)
+ {
+ format = SubstVar(format, std::string("$(") + O->first + ")", O->second);
+ }
+ format = SubstVar(format, "$(METAKEY)", MetaKey);
+ format = SubstVar(format, "$(SHORTDESC)", ShortDesc);
+ format = SubstVar(format, "$(DESCRIPTION)", Description);
+ format = SubstVar(format, "$(URI)", URI);
+ format = SubstVar(format, "$(FILENAME)", Option(IndexTarget::FILENAME));
+ return format;
+}
+ /*}}}*/
+
+pkgIndexTargetFile::pkgIndexTargetFile(IndexTarget const &Target, bool const Trusted) :/*{{{*/
+ pkgIndexFile(Trusted), Target(Target)
+{
+}
+ /*}}}*/
+std::string pkgIndexTargetFile::ArchiveURI(std::string File) const/*{{{*/
+{
+ return Target.Option(IndexTarget::REPO_URI) + File;
+}
+ /*}}}*/
+std::string pkgIndexTargetFile::Describe(bool Short) const /*{{{*/
+{
+ if (Short)
+ return Target.Description;
+ return Target.Description + " (" + IndexFileName() + ")";
+}
+ /*}}}*/
+std::string pkgIndexTargetFile::IndexFileName() const /*{{{*/
+{
+ std::string const s = Target.Option(IndexTarget::FILENAME);
+ if (FileExists(s))
+ return s;
+
+ std::vector<std::string> types = APT::Configuration::getCompressionTypes();
+ for (std::vector<std::string>::const_iterator t = types.begin(); t != types.end(); ++t)
+ {
+ std::string p = s + '.' + *t;
+ if (FileExists(p))
+ return p;
+ }
+ return s;
+}
+ /*}}}*/
+unsigned long pkgIndexTargetFile::Size() const /*{{{*/
+{
+ unsigned long size = 0;
+
+ /* we need to ignore errors here; if the lists are absent, just return 0 */
+ _error->PushToStack();
+
+ FileFd f(IndexFileName(), FileFd::ReadOnly, FileFd::Extension);
+ if (!f.Failed())
+ size = f.Size();
+
+ if (_error->PendingError() == true)
+ size = 0;
+ _error->RevertToStack();
+
+ return size;
+}
+ /*}}}*/
+bool pkgIndexTargetFile::Exists() const /*{{{*/
+{
+ return FileExists(IndexFileName());
+}
+ /*}}}*/
+
+APT_CONST pkgIndexFile::~pkgIndexFile() {}
+APT_CONST pkgIndexTargetFile::~pkgIndexTargetFile() {}
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index 817165f08..c51879bb8 100644
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -1,6 +1,5 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: indexfile.h,v 1.6.2.1 2003/12/24 23:09:17 mdz Exp $
/* ######################################################################
Index File - Abstraction for an index of archive/source file.
@@ -28,6 +27,7 @@
#include <apt-pkg/cacheiterators.h>
#include <apt-pkg/macros.h>
+#include <map>
#include <string>
#ifndef APT_8_CLEANER_HEADERS
@@ -40,17 +40,65 @@ class pkgAcquire;
class pkgCacheGenerator;
class OpProgress;
+class IndexTarget /*{{{*/
+/** \brief Information about an index file. */
+{
+ public:
+ /** \brief A URI from which the index file can be downloaded. */
+ std::string URI;
+
+ /** \brief A description of the index file. */
+ std::string Description;
+
+ /** \brief A shorter description of the index file. */
+ std::string ShortDesc;
+
+ /** \brief The key by which this index file should be
+ looked up within the meta index file. */
+ std::string MetaKey;
+
+ /** \brief Is it okay if the file isn't found in the meta index */
+ bool IsOptional;
+
+ /** \brief options with which this target was created
+ Prefer the usage of #Option if at all possible.
+ Beware: Not all of these options are intended for public use */
+ std::map<std::string, std::string> Options;
+
+ IndexTarget(std::string const &MetaKey, std::string const &ShortDesc,
+ std::string const &LongDesc, std::string const &URI, bool const IsOptional,
+ std::map<std::string, std::string> const &Options);
+
+ enum OptionKeys {
+ SITE,
+ RELEASE,
+ COMPONENT,
+ LANGUAGE,
+ ARCHITECTURE,
+ BASE_URI,
+ REPO_URI,
+ CREATED_BY,
+ TARGET_OF,
+ FILENAME,
+ EXISTING_FILENAME,
+ };
+ std::string Option(OptionKeys const Key) const;
+ std::string Format(std::string format) const;
+};
+ /*}}}*/
+
class pkgIndexFile
{
+ void *d;
protected:
bool Trusted;
-
+
public:
class Type
{
public:
-
+
// Global list of Items supported
static Type **GlobalList;
static unsigned long GlobalListLen;
@@ -70,7 +118,7 @@ class pkgIndexFile
virtual std::string ArchiveInfo(pkgCache::VerIterator Ver) const;
virtual std::string SourceInfo(pkgSrcRecords::Parser const &Record,
pkgSrcRecords::File const &File) const;
- virtual std::string Describe(bool Short = false) const = 0;
+ virtual std::string Describe(bool Short = false) const = 0;
// Interface for acquire
virtual std::string ArchiveURI(std::string /*File*/) const {return std::string();};
@@ -95,9 +143,27 @@ class pkgIndexFile
static std::string LanguageCode();
bool IsTrusted() const { return Trusted; };
-
- pkgIndexFile(bool Trusted): Trusted(Trusted) {};
- virtual ~pkgIndexFile() {};
+
+ pkgIndexFile(bool Trusted);
+ virtual ~pkgIndexFile();
+};
+
+class pkgIndexTargetFile : public pkgIndexFile
+{
+ void *d;
+protected:
+ IndexTarget const Target;
+
+ std::string IndexFileName() const;
+
+public:
+ virtual std::string ArchiveURI(std::string File) const;
+ virtual std::string Describe(bool Short = false) const;
+ virtual bool Exists() const;
+ virtual unsigned long Size() const;
+
+ pkgIndexTargetFile(IndexTarget const &Target, bool const Trusted);
+ virtual ~pkgIndexTargetFile();
};
#endif
diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index e1e9ba657..7e6da9558 100644
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -58,6 +58,11 @@ APT_PURE time_t indexRecords::GetValidUntil() const
return this->ValidUntil;
}
+APT_PURE time_t indexRecords::GetDate() const
+{
+ return this->Date;
+}
+
APT_PURE indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
{
std::map<std::string, indexRecords::checkSum* >::const_iterator sum = Entries.find(MetaKey);
@@ -68,7 +73,7 @@ APT_PURE indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
APT_PURE bool indexRecords::Exists(string const &MetaKey) const
{
- return Entries.count(MetaKey) == 1;
+ return Entries.find(MetaKey) != Entries.end();
}
bool indexRecords::Load(const string Filename) /*{{{*/
@@ -116,17 +121,8 @@ bool indexRecords::Load(const string Filename) /*{{{*/
indexRecords::checkSum *Sum = new indexRecords::checkSum;
Sum->MetaKeyFilename = Name;
Sum->Size = Size;
- std::string SizeStr;
- strprintf(SizeStr, "%llu", Size);
- Sum->Hashes.push_back(HashString("Checksum-FileSize", SizeStr));
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
- Sum->Hash = HashString(HashString::SupportedHashes()[i],Hash);
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+ Sum->Hashes.FileSize(Size);
+ APT_IGNORE_DEPRECATED(Sum->Hash = HashString(HashString::SupportedHashes()[i],Hash);)
Entries[Name] = Sum;
}
Entries[Name]->Hashes.push_back(HashString(HashString::SupportedHashes()[i],Hash));
@@ -140,9 +136,15 @@ bool indexRecords::Load(const string Filename) /*{{{*/
return false;
}
- string Label = Section.FindS("Label");
- string StrDate = Section.FindS("Date");
- string StrValidUntil = Section.FindS("Valid-Until");
+ string const StrDate = Section.FindS("Date");
+ if (RFC1123StrToTime(StrDate.c_str(), Date) == false)
+ {
+ strprintf(ErrorText, _("Invalid 'Date' entry in Release file %s"), Filename.c_str());
+ return false;
+ }
+
+ string const Label = Section.FindS("Label");
+ string const StrValidUntil = Section.FindS("Valid-Until");
// if we have a Valid-Until header in the Release file, use it as default
if (StrValidUntil.empty() == false)
@@ -165,20 +167,13 @@ bool indexRecords::Load(const string Filename) /*{{{*/
(MinAge == 0 || ValidUntil == 0)) // No user settings, use the one from the Release file
return true;
- time_t date;
- if (RFC1123StrToTime(StrDate.c_str(), date) == false)
- {
- strprintf(ErrorText, _("Invalid 'Date' entry in Release file %s"), Filename.c_str());
- return false;
- }
-
if (MinAge != 0 && ValidUntil != 0) {
- time_t const min_date = date + MinAge;
+ time_t const min_date = Date + MinAge;
if (ValidUntil < min_date)
ValidUntil = min_date;
}
if (MaxAge != 0) {
- time_t const max_date = date + MaxAge;
+ time_t const max_date = Date + MaxAge;
if (ValidUntil == 0 || ValidUntil > max_date)
ValidUntil = max_date;
}
@@ -277,10 +272,23 @@ void indexRecords::SetTrusted(bool const Trusted)
this->Trusted = NEVER_TRUSTED;
}
+#if APT_PKG_ABI >= 413
indexRecords::indexRecords(const string &ExpectedDist) :
Trusted(CHECK_TRUST), d(NULL), ExpectedDist(ExpectedDist), ValidUntil(0),
SupportsAcquireByHash(false)
{
}
+#else
+indexRecords::indexRecords() :
+ Trusted(CHECK_TRUST), d(NULL), ExpectedDist(""), ValidUntil(0),
+ SupportsAcquireByHash(false)
+{
+}
+indexRecords::indexRecords(const string ExpectedDist) :
+ Trusted(CHECK_TRUST), d(NULL), ExpectedDist(ExpectedDist), ValidUntil(0),
+ SupportsAcquireByHash(false)
+{
+}
+#endif
indexRecords::~indexRecords() {}
diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h
index 88a06779c..f7dfa3235 100644
--- a/apt-pkg/indexrecords.h
+++ b/apt-pkg/indexrecords.h
@@ -1,7 +1,4 @@
// -*- mode: cpp; mode: fold -*-
-// Description /*{{{*/
-// $Id: indexrecords.h,v 1.1.2.1 2003/12/24 23:09:17 mdz Exp $
- /*}}}*/
#ifndef PKGLIB_INDEXRECORDS_H
#define PKGLIB_INDEXRECORDS_H
@@ -36,14 +33,19 @@ class indexRecords
std::string Dist;
std::string Suite;
std::string ExpectedDist;
+ time_t Date;
time_t ValidUntil;
bool SupportsAcquireByHash;
std::map<std::string,checkSum *> Entries;
public:
-
+#if APT_PKG_ABI >= 413
indexRecords(const std::string &ExpectedDist = "");
+#else
+ indexRecords();
+ indexRecords(const std::string ExpectedDist);
+#endif
// Lookup function
virtual checkSum *Lookup(const std::string MetaKey);
@@ -58,6 +60,7 @@ class indexRecords
std::string GetSuite() const;
bool GetSupportsAcquireByHash() const;
time_t GetValidUntil() const;
+ time_t GetDate() const;
std::string GetExpectedDist() const;
/** \brief check if source is marked as always trusted */
@@ -76,11 +79,7 @@ class indexRecords
virtual ~indexRecords();
};
-#if __GNUC__ >= 4
- // ensure that con- & de-structor don't trigger this warning
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
struct indexRecords::checkSum
{
std::string MetaKeyFilename;
@@ -89,8 +88,6 @@ struct indexRecords::checkSum
APT_DEPRECATED HashString Hash;
};
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
#endif
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index d04c51621..96966b249 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -89,7 +89,7 @@ bool pkgInitConfig(Configuration &Cnf)
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$");
// Repository security
- // FIXME: this is set to "true" for backward compatiblity, once
+ // FIXME: this is set to "true" for backward compatibility, once
// jessie is out we want to change this to "false" to
// improve security
Cnf.CndSet("Acquire::AllowInsecureRepositories", true);
@@ -101,8 +101,30 @@ bool pkgInitConfig(Configuration &Cnf)
// The default user we drop to in the methods
Cnf.CndSet("APT::Sandbox::User", "_apt");
+ Cnf.CndSet("APT::Acquire::Targets::deb::Packages::MetaKey", "$(COMPONENT)/binary-$(ARCHITECTURE)/Packages");
+ Cnf.CndSet("APT::Acquire::Targets::deb::Packages::flatMetaKey", "Packages");
+ Cnf.CndSet("APT::Acquire::Targets::deb::Packages::ShortDescription", "Packages");
+ Cnf.CndSet("APT::Acquire::Targets::deb::Packages::Description", "$(SITE) $(RELEASE)/$(COMPONENT) $(ARCHITECTURE) Packages");
+ Cnf.CndSet("APT::Acquire::Targets::deb::Packages::flatDescription", "$(SITE) $(RELEASE) Packages");
+ Cnf.CndSet("APT::Acquire::Targets::deb::Packages::Optional", false);
+ Cnf.CndSet("APT::Acquire::Targets::deb::Translations::MetaKey", "$(COMPONENT)/i18n/Translation-$(LANGUAGE)");
+ Cnf.CndSet("APT::Acquire::Targets::deb::Translations::flatMetaKey", "$(LANGUAGE)");
+ Cnf.CndSet("APT::Acquire::Targets::deb::Translations::ShortDescription", "Translation-$(LANGUAGE)");
+ Cnf.CndSet("APT::Acquire::Targets::deb::Translations::Description", "$(SITE) $(RELEASE)/$(COMPONENT) Translation-$(LANGUAGE)");
+ Cnf.CndSet("APT::Acquire::Targets::deb::Translations::flatDescription", "$(SITE) $(RELEASE) Translation-$(LANGUAGE)");
+ Cnf.CndSet("APT::Acquire::Targets::deb-src::Sources::MetaKey", "$(COMPONENT)/source/Sources");
+ Cnf.CndSet("APT::Acquire::Targets::deb-src::Sources::flatMetaKey", "Sources");
+ Cnf.CndSet("APT::Acquire::Targets::deb-src::Sources::ShortDescription", "Sources");
+ Cnf.CndSet("APT::Acquire::Targets::deb-src::Sources::Description", "$(SITE) $(RELEASE)/$(COMPONENT) Sources");
+ Cnf.CndSet("APT::Acquire::Targets::deb-src::Sources::flatDescription", "$(SITE) $(RELEASE) Sources");
+ Cnf.CndSet("APT::Acquire::Targets::deb-src::Sources::Optional", false);
+
+ Cnf.CndSet("Acquire::Changelogs::URI::Origin::Debian", "http://metadata.ftp-master.debian.org/changelogs/CHANGEPATH_changelog");
+ Cnf.CndSet("Acquire::Changelogs::URI::Origin::Ubuntu", "http://changelogs.ubuntu.com/changelogs/pool/CHANGEPATH/changelog");
+ Cnf.CndSet("Acquire::Changelogs::URI::Origin::Ultimedia", "http://packages.ultimediaos.com/changelogs/pool/CHANGEPATH/changelog.txt");
+
bool Res = true;
-
+
// Read an alternate config file
const char *Cfg = getenv("APT_CONFIG");
if (Cfg != 0 && strlen(Cfg) != 0)
diff --git a/apt-pkg/install-progress.cc b/apt-pkg/install-progress.cc
index 5ea8bf4d0..ee2ef683f 100644
--- a/apt-pkg/install-progress.cc
+++ b/apt-pkg/install-progress.cc
@@ -69,6 +69,7 @@ PackageManagerProgressFd::PackageManagerProgressFd(int progress_fd)
{
OutStatusFd = progress_fd;
}
+PackageManagerProgressFd::~PackageManagerProgressFd() {}
void PackageManagerProgressFd::WriteToStatusFd(std::string s)
{
@@ -157,6 +158,7 @@ PackageManagerProgressDeb822Fd::PackageManagerProgressDeb822Fd(int progress_fd)
{
OutStatusFd = progress_fd;
}
+PackageManagerProgressDeb822Fd::~PackageManagerProgressDeb822Fd() {}
void PackageManagerProgressDeb822Fd::WriteToStatusFd(std::string s)
{
@@ -433,6 +435,10 @@ bool PackageManagerText::StatusChanged(std::string PackageName,
return true;
}
+PackageManagerText::PackageManagerText() : PackageManager() {}
+PackageManagerText::~PackageManagerText() {}
+
+
} // namespace progress
diff --git a/apt-pkg/install-progress.h b/apt-pkg/install-progress.h
index d8b4a5c82..a4c5daf7f 100644
--- a/apt-pkg/install-progress.h
+++ b/apt-pkg/install-progress.h
@@ -61,6 +61,7 @@ namespace Progress {
class PackageManagerProgressFd : public PackageManager
{
+ void *d;
protected:
int OutStatusFd;
int StepsDone;
@@ -69,6 +70,7 @@ namespace Progress {
public:
PackageManagerProgressFd(int progress_fd);
+ virtual ~PackageManagerProgressFd();
virtual void StartDpkg();
virtual void Stop();
@@ -90,6 +92,7 @@ namespace Progress {
class PackageManagerProgressDeb822Fd : public PackageManager
{
+ void *d;
protected:
int OutStatusFd;
int StepsDone;
@@ -98,6 +101,7 @@ namespace Progress {
public:
PackageManagerProgressDeb822Fd(int progress_fd);
+ virtual ~PackageManagerProgressDeb822Fd();
virtual void StartDpkg();
virtual void Stop();
@@ -118,6 +122,7 @@ namespace Progress {
class PackageManagerFancy : public PackageManager
{
+ void *d;
private:
APT_HIDDEN static void staticSIGWINCH(int);
static std::vector<PackageManagerFancy*> instances;
@@ -138,7 +143,7 @@ namespace Progress {
public:
PackageManagerFancy();
- ~PackageManagerFancy();
+ virtual ~PackageManagerFancy();
virtual void Start(int child_pty=-1);
virtual void Stop();
virtual bool StatusChanged(std::string PackageName,
@@ -153,11 +158,15 @@ namespace Progress {
class PackageManagerText : public PackageManager
{
+ void *d;
public:
virtual bool StatusChanged(std::string PackageName,
unsigned int StepsDone,
unsigned int TotalSteps,
std::string HumanReadableAction);
+
+ PackageManagerText();
+ virtual ~PackageManagerText();
};
diff --git a/apt-pkg/metaindex.cc b/apt-pkg/metaindex.cc
new file mode 100644
index 000000000..3c1b696bd
--- /dev/null
+++ b/apt-pkg/metaindex.cc
@@ -0,0 +1,57 @@
+// Include Files /*{{{*/
+#include <apt-pkg/pkgcachegen.h>
+#include <apt-pkg/indexfile.h>
+#include <apt-pkg/metaindex.h>
+
+#include <stddef.h>
+
+#include <string>
+#include <vector>
+ /*}}}*/
+
+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+std::string metaIndex::LocalFileName() const { return ""; }
+#else
+#include <apt-pkg/debmetaindex.h>
+std::string metaIndex::LocalFileName() const
+{
+ debReleaseIndex const * deb = dynamic_cast<debReleaseIndex const*>(this);
+ if (deb != NULL)
+ return deb->LocalFileName();
+
+ return "";
+}
+#endif
+
+std::string metaIndex::Describe() const
+{
+ return "Release";
+}
+
+pkgCache::RlsFileIterator metaIndex::FindInCache(pkgCache &Cache, bool const) const
+{
+ return pkgCache::RlsFileIterator(Cache);
+}
+
+bool metaIndex::Merge(pkgCacheGenerator &Gen,OpProgress *) const
+{
+ return Gen.SelectReleaseFile("", "");
+}
+
+
+metaIndex::metaIndex(std::string const &URI, std::string const &Dist,
+ char const * const Type)
+: Indexes(NULL), Type(Type), URI(URI), Dist(Dist), Trusted(false)
+{
+ /* nothing */
+}
+
+metaIndex::~metaIndex()
+{
+ if (Indexes == 0)
+ return;
+ for (std::vector<pkgIndexFile *>::iterator I = (*Indexes).begin();
+ I != (*Indexes).end(); ++I)
+ delete *I;
+ delete Indexes;
+}
diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h
index 7c4d0c1aa..760c7dd15 100644
--- a/apt-pkg/metaindex.h
+++ b/apt-pkg/metaindex.h
@@ -22,9 +22,13 @@ using std::string;
#endif
class pkgAcquire;
+class IndexTarget;
+class pkgCacheGenerator;
+class OpProgress;
class metaIndex
{
+ void *d;
protected:
std::vector <pkgIndexFile *> *Indexes;
const char *Type;
@@ -40,33 +44,23 @@ class metaIndex
virtual const char* GetType() const {return Type;}
// interface to to query it
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
- // returns the path of the local file (or "" if its not available)
- virtual std::string LocalFileName() const {return "";};
-#endif
+ /** \return the path of the local file (or "" if its not available) */
+ virtual std::string LocalFileName() const;
// Interface for acquire
virtual std::string ArchiveURI(std::string const& File) const = 0;
virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const = 0;
- virtual std::vector<pkgIndexFile *> *GetIndexFiles() = 0;
+ virtual std::vector<IndexTarget> GetIndexTargets() const = 0;
+ virtual std::vector<pkgIndexFile *> *GetIndexFiles() = 0;
virtual bool IsTrusted() const = 0;
- metaIndex(std::string const &URI, std::string const &Dist,
- char const * const Type)
- : Indexes(NULL), Type(Type), URI(URI), Dist(Dist), Trusted(false)
- {
- /* nothing */
- }
+ virtual std::string Describe() const;
+ virtual pkgCache::RlsFileIterator FindInCache(pkgCache &Cache, bool const ModifyCheck) const;
+ virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
- virtual ~metaIndex()
- {
- if (Indexes == 0)
- return;
- for (std::vector<pkgIndexFile *>::iterator I = (*Indexes).begin();
- I != (*Indexes).end(); ++I)
- delete *I;
- delete Indexes;
- }
+ metaIndex(std::string const &URI, std::string const &Dist,
+ char const * const Type);
+ virtual ~metaIndex();
};
#endif
diff --git a/apt-pkg/orderlist.h b/apt-pkg/orderlist.h
index b8bad81b3..29ef79b84 100644
--- a/apt-pkg/orderlist.h
+++ b/apt-pkg/orderlist.h
@@ -1,6 +1,5 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: orderlist.h,v 1.9 2001/02/20 07:03:17 jgg Exp $
/* ######################################################################
Order List - Represents and Manipulates an ordered list of packages.
@@ -25,6 +24,7 @@
class pkgDepCache;
class pkgOrderList : protected pkgCache::Namespace
{
+ void *d;
protected:
pkgDepCache &Cache;
@@ -123,7 +123,7 @@ class pkgOrderList : protected pkgCache::Namespace
int Score(PkgIterator Pkg);
pkgOrderList(pkgDepCache *Cache);
- ~pkgOrderList();
+ virtual ~pkgOrderList();
};
#endif
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 2247d04db..d137dc75a 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -400,7 +400,8 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
// Check if the current version of the package is available and will satisfy this dependency
if (DepPkg.CurrentVer() == Ver && List->IsNow(DepPkg) == true &&
List->IsFlag(DepPkg,pkgOrderList::Removed) == false &&
- DepPkg.State() == PkgIterator::NeedsNothing)
+ DepPkg.State() == PkgIterator::NeedsNothing &&
+ (Cache[DepPkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)
{
Bad = false;
break;
@@ -413,8 +414,13 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
if (PkgLoop == true)
{
if (Debug)
- std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure" << std::endl;
- Bad = false;
+ std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure";
+ if (List->IsFlag(DepPkg,pkgOrderList::UnPacked))
+ Bad = false;
+ else if (Debug)
+ std::clog << ", but it isn't unpacked yet";
+ if (Debug)
+ std::clog << std::endl;
}
}
@@ -426,7 +432,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
if (Bad == false)
{
if (Debug)
- std::clog << OutputInDepth(Depth) << "Found ok dep " << D.TargetPkg() << std::endl;
+ std::clog << OutputInDepth(Depth) << "Found ok dep " << Start.TargetPkg() << std::endl;
continue;
}
@@ -444,7 +450,8 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
// Check if the current version of the package is available and will satisfy this dependency
if (DepPkg.CurrentVer() == Ver && List->IsNow(DepPkg) == true &&
List->IsFlag(DepPkg,pkgOrderList::Removed) == false &&
- DepPkg.State() == PkgIterator::NeedsNothing)
+ DepPkg.State() == PkgIterator::NeedsNothing &&
+ (Cache[DepPkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)
continue;
// Check if the version that is going to be installed will satisfy the dependency
@@ -454,8 +461,13 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
if (PkgLoop == true)
{
if (Debug)
- std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure" << std::endl;
- Bad = false;
+ std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure";
+ if (List->IsFlag(DepPkg,pkgOrderList::UnPacked))
+ Bad = false;
+ else if (Debug)
+ std::clog << ", but it isn't unpacked yet";
+ if (Debug)
+ std::clog << std::endl;
}
else
{
@@ -722,7 +734,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
// See if the current version is ok
if (Pkg.CurrentVer() == Ver && List->IsNow(Pkg) == true &&
- Pkg.State() == PkgIterator::NeedsNothing)
+ Pkg.State() == PkgIterator::NeedsNothing &&
+ (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)
{
Bad = false;
if (Debug)
@@ -744,8 +757,11 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
PkgIterator DepPkg = Ver.ParentPkg();
// Not the install version
- if (Cache[DepPkg].InstallVer != *I ||
- (Cache[DepPkg].Keep() == true && DepPkg.State() == PkgIterator::NeedsNothing))
+ if (Cache[DepPkg].InstallVer != *I)
+ continue;
+
+ if (Cache[DepPkg].Keep() == true && DepPkg.State() == PkgIterator::NeedsNothing &&
+ (Cache[DepPkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall)
continue;
if (List->IsFlag(DepPkg,pkgOrderList::Configured))
@@ -757,6 +773,16 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
// check if it needs unpack or if if configure is enough
if (List->IsFlag(DepPkg,pkgOrderList::UnPacked) == false)
{
+ // two packages pre-depending on each other can't be handled sanely
+ if (List->IsFlag(DepPkg,pkgOrderList::Loop) && PkgLoop)
+ {
+ // this isn't an error as there is potential for something else to satisfy it
+ // (like a provides or an or-group member)
+ if (Debug)
+ clog << OutputInDepth(Depth) << "Unpack loop detected between " << DepPkg.FullName() << " and " << Pkg.FullName() << endl;
+ continue;
+ }
+
if (Debug)
clog << OutputInDepth(Depth) << "Trying to SmartUnpack " << DepPkg.FullName() << endl;
if (NonLoopingSmart(UNPACK_IMMEDIATE, Pkg, DepPkg, Depth, PkgLoop, &Bad, &Changed) == false)
@@ -1059,7 +1085,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
// PM::DoInstallPostFork - compat /*{{{*/
// ---------------------------------------------------------------------
/*}}}*/
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+#if APT_PKG_ABI >= 413
pkgPackageManager::OrderResult
pkgPackageManager::DoInstallPostFork(int statusFd)
{
@@ -1096,7 +1122,7 @@ pkgPackageManager::DoInstallPostFork(int statusFd)
// PM::DoInstall - Does the installation /*{{{*/
// ---------------------------------------------------------------------
/* compat */
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+#if APT_PKG_ABI >= 413
pkgPackageManager::OrderResult
pkgPackageManager::DoInstall(int statusFd)
{
@@ -1120,7 +1146,7 @@ pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd)
// ---------------------------------------------------------------------
/* This uses the filenames in FileNames and the information in the
DepCache to perform the installation of packages.*/
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+#if APT_PKG_ABI >= 413
pkgPackageManager::OrderResult
pkgPackageManager::DoInstall(APT::Progress::PackageManager *progress)
{
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 5bcd2045d..60414ae1c 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -1,6 +1,5 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: packagemanager.h,v 1.14 2001/05/07 04:24:08 jgg Exp $
/* ######################################################################
Package Manager - Abstacts the package manager
@@ -96,12 +95,10 @@ class pkgPackageManager : protected pkgCache::Namespace
virtual bool Install(PkgIterator /*Pkg*/,std::string /*File*/) {return false;};
virtual bool Configure(PkgIterator /*Pkg*/) {return false;};
virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+#if APT_PKG_ABI >= 413
virtual bool Go(APT::Progress::PackageManager * /*progress*/) {return true;};
- virtual bool Go(int /*statusFd*/=-1) {return true;};
-#else
- virtual bool Go(int /*statusFd*/=-1) {return true;};
#endif
+ virtual bool Go(int /*statusFd*/=-1) {return true;};
virtual void Reset() {};
@@ -114,8 +111,8 @@ class pkgPackageManager : protected pkgCache::Namespace
bool GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
pkgRecords *Recs);
- // Do the installation
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+ // Do the installation
+#if APT_PKG_ABI >= 413
OrderResult DoInstall(APT::Progress::PackageManager *progress);
// compat
APT_DEPRECATED OrderResult DoInstall(int statusFd=-1);
@@ -129,7 +126,7 @@ class pkgPackageManager : protected pkgCache::Namespace
Res = OrderInstall();
return Res;
};
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+#if APT_PKG_ABI >= 413
// stuff that needs to be done after the fork
OrderResult DoInstallPostFork(APT::Progress::PackageManager *progress);
// compat
@@ -148,6 +145,7 @@ class pkgPackageManager : protected pkgCache::Namespace
virtual ~pkgPackageManager();
private:
+ void *d;
enum APT_HIDDEN SmartAction { UNPACK_IMMEDIATE, UNPACK, CONFIGURE };
APT_HIDDEN bool NonLoopingSmart(SmartAction const action, pkgCache::PkgIterator &Pkg,
pkgCache::PkgIterator DepPkg, int const Depth, bool const PkgLoop,
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 572685ba5..dc7698edd 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -61,6 +61,7 @@ pkgCache::Header::Header()
HeaderSz = sizeof(pkgCache::Header);
GroupSz = sizeof(pkgCache::Group);
PackageSz = sizeof(pkgCache::Package);
+ ReleaseFileSz = sizeof(pkgCache::ReleaseFile);
PackageFileSz = sizeof(pkgCache::PackageFile);
VersionSz = sizeof(pkgCache::Version);
DescriptionSz = sizeof(pkgCache::Description);
@@ -74,6 +75,7 @@ pkgCache::Header::Header()
VersionCount = 0;
DescriptionCount = 0;
DependsCount = 0;
+ ReleaseFileCount = 0;
PackageFileCount = 0;
VerFileCount = 0;
DescFileCount = 0;
@@ -82,10 +84,14 @@ pkgCache::Header::Header()
MaxDescFileSize = 0;
FileList = 0;
+ RlsFileList = 0;
+#if APT_PKG_ABI < 413
+ APT_IGNORE_DEPRECATED(StringList = 0;)
+#endif
VerSysName = 0;
Architecture = 0;
- Architectures = 0;
- HashTableSize = _config->FindI("APT::Cache-HashTableSize", 10 * 1048);
+ SetArchitectures(0);
+ SetHashTableSize(_config->FindI("APT::Cache-HashTableSize", 10 * 1048));
memset(Pools,0,sizeof(Pools));
CacheFileSize = 0;
@@ -99,6 +105,7 @@ bool pkgCache::Header::CheckSizes(Header &Against) const
if (HeaderSz == Against.HeaderSz &&
GroupSz == Against.GroupSz &&
PackageSz == Against.PackageSz &&
+ ReleaseFileSz == Against.ReleaseFileSz &&
PackageFileSz == Against.PackageFileSz &&
VersionSz == Against.VersionSz &&
DescriptionSz == Against.DescriptionSz &&
@@ -114,6 +121,7 @@ bool pkgCache::Header::CheckSizes(Header &Against) const
// Cache::pkgCache - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
+APT_IGNORE_DEPRECATED_PUSH
pkgCache::pkgCache(MMap *Map, bool DoMap) : Map(*Map)
{
// call getArchitectures() with cached=false to ensure that the
@@ -123,6 +131,7 @@ pkgCache::pkgCache(MMap *Map, bool DoMap) : Map(*Map)
if (DoMap == true)
ReMap();
}
+APT_IGNORE_DEPRECATED_POP
/*}}}*/
// Cache::ReMap - Reopen the cache file /*{{{*/
// ---------------------------------------------------------------------
@@ -135,6 +144,7 @@ bool pkgCache::ReMap(bool const &Errorchecks)
PkgP = (Package *)Map.Data();
VerFileP = (VerFile *)Map.Data();
DescFileP = (DescFile *)Map.Data();
+ RlsFileP = (ReleaseFile *)Map.Data();
PkgFileP = (PackageFile *)Map.Data();
VerP = (Version *)Map.Data();
DescP = (Description *)Map.Data();
@@ -162,7 +172,7 @@ bool pkgCache::ReMap(bool const &Errorchecks)
if (Map.Size() < HeaderP->CacheFileSize)
return _error->Error(_("The package cache file is corrupted, it is too small"));
- if (HeaderP->VerSysName == 0 || HeaderP->Architecture == 0 || HeaderP->Architectures == 0)
+ if (HeaderP->VerSysName == 0 || HeaderP->Architecture == 0 || HeaderP->GetArchitectures() == 0)
return _error->Error(_("The package cache file is corrupted"));
// Locate our VS..
@@ -176,8 +186,8 @@ bool pkgCache::ReMap(bool const &Errorchecks)
for (++a; a != archs.end(); ++a)
list.append(",").append(*a);
if (_config->Find("APT::Architecture") != StrP + HeaderP->Architecture ||
- list != StrP + HeaderP->Architectures)
- return _error->Error(_("The package cache was built for different architectures: %s vs %s"), StrP + HeaderP->Architectures, list.c_str());
+ list != StrP + HeaderP->GetArchitectures())
+ return _error->Error(_("The package cache was built for different architectures: %s vs %s"), StrP + HeaderP->GetArchitectures(), list.c_str());
return true;
}
@@ -192,7 +202,7 @@ map_id_t pkgCache::sHash(const string &Str) const
unsigned long Hash = 0;
for (string::const_iterator I = Str.begin(); I != Str.end(); ++I)
Hash = 41 * Hash + tolower_ascii(*I);
- return Hash % HeaderP->HashTableSize;
+ return Hash % HeaderP->GetHashTableSize();
}
map_id_t pkgCache::sHash(const char *Str) const
@@ -200,7 +210,7 @@ map_id_t pkgCache::sHash(const char *Str) const
unsigned long Hash = tolower_ascii(*Str);
for (const char *I = Str + 1; *I != 0; ++I)
Hash = 41 * Hash + tolower_ascii(*I);
- return Hash % HeaderP->HashTableSize;
+ return Hash % HeaderP->GetHashTableSize();
}
/*}}}*/
// Cache::SingleArchFindPkg - Locate a package by name /*{{{*/
@@ -211,8 +221,8 @@ map_id_t pkgCache::sHash(const char *Str) const
pkgCache::PkgIterator pkgCache::SingleArchFindPkg(const string &Name)
{
// Look at the hash bucket
- Package *Pkg = PkgP + HeaderP->PkgHashTable()[Hash(Name)];
- for (; Pkg != PkgP; Pkg = PkgP + Pkg->Next)
+ Package *Pkg = PkgP + HeaderP->PkgHashTableP()[Hash(Name)];
+ for (; Pkg != PkgP; Pkg = PkgP + Pkg->NextPackage)
{
int const cmp = strcmp(Name.c_str(), StrP + (GrpP + Pkg->Group)->Name);
if (cmp == 0)
@@ -229,12 +239,7 @@ pkgCache::PkgIterator pkgCache::SingleArchFindPkg(const string &Name)
pkgCache::PkgIterator pkgCache::FindPkg(const string &Name) {
size_t const found = Name.find(':');
if (found == string::npos)
- {
- if (MultiArchCache() == false)
- return SingleArchFindPkg(Name);
- else
- return FindPkg(Name, "native");
- }
+ return FindPkg(Name, "native");
string const Arch = Name.substr(found+1);
/* Beware: This is specialcased to handle pkg:any in dependencies as
these are linked to virtual pkg:any named packages with all archs.
@@ -248,13 +253,6 @@ pkgCache::PkgIterator pkgCache::FindPkg(const string &Name) {
// ---------------------------------------------------------------------
/* Returns 0 on error, pointer to the package otherwise */
pkgCache::PkgIterator pkgCache::FindPkg(const string &Name, string const &Arch) {
- if (MultiArchCache() == false && Arch != "none") {
- if (Arch == "native" || Arch == "all" || Arch == "any" ||
- Arch == NativeArch())
- return SingleArchFindPkg(Name);
- else
- return PkgIterator(*this,0);
- }
/* We make a detour via the GrpIterator here as
on a multi-arch environment a group is easier to
find than a package (less entries in the buckets) */
@@ -273,7 +271,7 @@ pkgCache::GrpIterator pkgCache::FindGrp(const string &Name) {
return GrpIterator(*this,0);
// Look at the hash bucket for the group
- Group *Grp = GrpP + HeaderP->GrpHashTable()[sHash(Name)];
+ Group *Grp = GrpP + HeaderP->GrpHashTableP()[sHash(Name)];
for (; Grp != GrpP; Grp = GrpP + Grp->Next) {
int const cmp = strcmp(Name.c_str(), StrP + Grp->Name);
if (cmp == 0)
@@ -359,7 +357,7 @@ pkgCache::PkgIterator pkgCache::GrpIterator::FindPkg(string Arch) const {
// Iterate over the list to find the matching arch
for (pkgCache::Package *Pkg = PackageList(); Pkg != Owner->PkgP;
- Pkg = Owner->PkgP + Pkg->Next) {
+ Pkg = Owner->PkgP + Pkg->NextPackage) {
if (stringcmp(Arch, Owner->StrP + Pkg->Arch) == 0)
return PkgIterator(*Owner, Pkg);
if ((Owner->PkgP + S->LastPackage) == Pkg)
@@ -407,7 +405,7 @@ pkgCache::PkgIterator pkgCache::GrpIterator::NextPkg(pkgCache::PkgIterator const
if (S->LastPackage == LastPkg.Index())
return PkgIterator(*Owner, 0);
- return PkgIterator(*Owner, Owner->PkgP + LastPkg->Next);
+ return PkgIterator(*Owner, Owner->PkgP + LastPkg->NextPackage);
}
/*}}}*/
// GrpIterator::operator ++ - Postfix incr /*{{{*/
@@ -420,10 +418,10 @@ void pkgCache::GrpIterator::operator ++(int)
S = Owner->GrpP + S->Next;
// Follow the hash table
- while (S == Owner->GrpP && (HashIndex+1) < (signed)Owner->HeaderP->HashTableSize)
+ while (S == Owner->GrpP && (HashIndex+1) < (signed)Owner->HeaderP->GetHashTableSize())
{
HashIndex++;
- S = Owner->GrpP + Owner->HeaderP->GrpHashTable()[HashIndex];
+ S = Owner->GrpP + Owner->HeaderP->GrpHashTableP()[HashIndex];
}
}
/*}}}*/
@@ -434,13 +432,13 @@ void pkgCache::PkgIterator::operator ++(int)
{
// Follow the current links
if (S != Owner->PkgP)
- S = Owner->PkgP + S->Next;
+ S = Owner->PkgP + S->NextPackage;
// Follow the hash table
- while (S == Owner->PkgP && (HashIndex+1) < (signed)Owner->HeaderP->HashTableSize)
+ while (S == Owner->PkgP && (HashIndex+1) < (signed)Owner->HeaderP->GetHashTableSize())
{
HashIndex++;
- S = Owner->PkgP + Owner->HeaderP->PkgHashTable()[HashIndex];
+ S = Owner->PkgP + Owner->HeaderP->PkgHashTableP()[HashIndex];
}
}
/*}}}*/
@@ -821,7 +819,7 @@ APT_PURE bool pkgCache::VerIterator::Downloadable() const
{
VerFileIterator Files = FileList();
for (; Files.end() == false; ++Files)
- if ((Files.File()->Flags & pkgCache::Flag::NotSource) != pkgCache::Flag::NotSource)
+ if (Files.File().Flagged(pkgCache::Flag::NotSource) == false)
return true;
return false;
}
@@ -835,7 +833,7 @@ APT_PURE bool pkgCache::VerIterator::Automatic() const
VerFileIterator Files = FileList();
for (; Files.end() == false; ++Files)
// Do not check ButAutomaticUpgrades here as it is kind of automatic…
- if ((Files.File()->Flags & pkgCache::Flag::NotAutomatic) != pkgCache::Flag::NotAutomatic)
+ if (Files.File().Flagged(pkgCache::Flag::NotAutomatic) == false)
return true;
return false;
}
@@ -868,27 +866,27 @@ string pkgCache::VerIterator::RelStr() const
for (pkgCache::VerFileIterator I = this->FileList(); I.end() == false; ++I)
{
// Do not print 'not source' entries'
- pkgCache::PkgFileIterator File = I.File();
- if ((File->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource)
+ pkgCache::PkgFileIterator const File = I.File();
+ if (File.Flagged(pkgCache::Flag::NotSource))
continue;
// See if we have already printed this out..
bool Seen = false;
for (pkgCache::VerFileIterator J = this->FileList(); I != J; ++J)
{
- pkgCache::PkgFileIterator File2 = J.File();
- if (File2->Label == 0 || File->Label == 0)
+ pkgCache::PkgFileIterator const File2 = J.File();
+ if (File2.Label() == 0 || File.Label() == 0)
continue;
if (strcmp(File.Label(),File2.Label()) != 0)
continue;
- if (File2->Version == File->Version)
+ if (File2.Version() == File.Version())
{
Seen = true;
break;
}
- if (File2->Version == 0 || File->Version == 0)
+ if (File2.Version() == 0 || File.Version() == 0)
break;
if (strcmp(File.Version(),File2.Version()) == 0)
Seen = true;
@@ -902,12 +900,12 @@ string pkgCache::VerIterator::RelStr() const
else
First = false;
- if (File->Label != 0)
+ if (File.Label() != 0)
Res = Res + File.Label() + ':';
- if (File->Archive != 0)
+ if (File.Archive() != 0)
{
- if (File->Version == 0)
+ if (File.Version() == 0)
Res += File.Archive();
else
Res = Res + File.Version() + '/' + File.Archive();
@@ -915,7 +913,7 @@ string pkgCache::VerIterator::RelStr() const
else
{
// No release file, print the host name that this came from
- if (File->Site == 0 || File.Site()[0] == 0)
+ if (File.Site() == 0 || File.Site()[0] == 0)
Res += "localhost";
else
Res += File.Site();
@@ -938,12 +936,12 @@ const char * pkgCache::VerIterator::MultiArchType() const
return "none";
}
/*}}}*/
-// PkgFileIterator::IsOk - Checks if the cache is in sync with the file /*{{{*/
+// RlsFileIterator::IsOk - Checks if the cache is in sync with the file /*{{{*/
// ---------------------------------------------------------------------
/* This stats the file and compares its stats with the ones that were
- stored during generation. Date checks should probably also be
+ stored during generation. Date checks should probably also be
included here. */
-bool pkgCache::PkgFileIterator::IsOk()
+bool pkgCache::RlsFileIterator::IsOk()
{
struct stat Buf;
if (stat(FileName(),&Buf) != 0)
@@ -955,10 +953,8 @@ bool pkgCache::PkgFileIterator::IsOk()
return true;
}
/*}}}*/
-// PkgFileIterator::RelStr - Return the release string /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string pkgCache::PkgFileIterator::RelStr()
+// RlsFileIterator::RelStr - Return the release string /*{{{*/
+string pkgCache::RlsFileIterator::RelStr()
{
string Res;
if (Version() != 0)
@@ -971,8 +967,40 @@ string pkgCache::PkgFileIterator::RelStr()
Res = Res + (Res.empty() == true?"n=":",n=") + Codename();
if (Label() != 0)
Res = Res + (Res.empty() == true?"l=":",l=") + Label();
- if (Component() != 0)
- Res = Res + (Res.empty() == true?"c=":",c=") + Component();
+ return Res;
+}
+ /*}}}*/
+// PkgFileIterator::IsOk - Checks if the cache is in sync with the file /*{{{*/
+// ---------------------------------------------------------------------
+/* This stats the file and compares its stats with the ones that were
+ stored during generation. Date checks should probably also be
+ included here. */
+bool pkgCache::PkgFileIterator::IsOk()
+{
+ struct stat Buf;
+ if (stat(FileName(),&Buf) != 0)
+ return false;
+
+ if (Buf.st_size != (signed)S->Size || Buf.st_mtime != S->mtime)
+ return false;
+
+ return true;
+}
+ /*}}}*/
+string pkgCache::PkgFileIterator::RelStr() /*{{{*/
+{
+ std::string Res;
+ if (ReleaseFile() == 0)
+ {
+ if (Component() != 0)
+ Res = Res + (Res.empty() == true?"a=":",a=") + Component();
+ }
+ else
+ {
+ Res = ReleaseFile().RelStr();
+ if (Component() != 0)
+ Res = Res + (Res.empty() == true?"c=":",c=") + Component();
+ }
if (Architecture() != 0)
Res = Res + (Res.empty() == true?"b=":",b=") + Architecture();
return Res;
@@ -1031,9 +1059,5 @@ bool pkgCache::PrvIterator::IsMultiArchImplicit() const
return false;
}
/*}}}*/
-APT_DEPRECATED APT_PURE const char * pkgCache::PkgIterator::Section() const {/*{{{*/
- if (S->VersionList == 0)
- return 0;
- return VersionList().Section();
-}
- /*}}}*/
+
+pkgCache::~pkgCache() {}
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 4f8568205..b7bf26c2a 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -85,16 +85,45 @@
using std::string;
#endif
+#if APT_PKG_ABI >= 413
// storing file sizes of indexes, which are way below 4 GB for now
typedef uint32_t map_filesize_t;
+typedef map_filesize_t should_be_map_filesize_t;
+#else
+typedef unsigned long map_filesize_t;
+typedef unsigned int should_be_map_filesize_t;
+#endif
+#if APT_PKG_ABI >= 413
// each package/group/dependency gets an id
typedef uint32_t map_id_t;
+typedef map_id_t should_be_map_id_t;
+#else
+typedef unsigned long map_id_t;
+typedef unsigned int should_be_map_id_t;
+#endif
+#if APT_PKG_ABI >= 413
// some files get an id, too, but in far less absolute numbers
typedef uint16_t map_fileid_t;
+typedef map_fileid_t should_be_map_fileid_t;
+#else
+typedef unsigned long map_fileid_t;
+typedef unsigned int should_be_map_fileid_t;
+#endif
+#if APT_PKG_ABI >= 413
// relative pointer from cache start
typedef uint32_t map_pointer_t;
+#else
+typedef unsigned int map_pointer_t;
+#endif
// same as the previous, but documented to be to a string item
typedef map_pointer_t map_stringitem_t;
+#if APT_PKG_ABI >= 413
+typedef uint64_t should_be_uint64_t;
+typedef uint64_t should_be_uint64_small_t;
+#else
+typedef unsigned long long should_be_uint64_t;
+typedef unsigned long should_be_uint64_small_t;
+#endif
class pkgVersioningSystem;
class pkgCache /*{{{*/
@@ -104,11 +133,13 @@ class pkgCache /*{{{*/
struct Header;
struct Group;
struct Package;
+ struct ReleaseFile;
struct PackageFile;
struct Version;
struct Description;
struct Provides;
struct Dependency;
+ struct StringItem;
struct VerFile;
struct DescFile;
@@ -120,6 +151,7 @@ class pkgCache /*{{{*/
class DescIterator;
class DepIterator;
class PrvIterator;
+ class RlsFileIterator;
class PkgFileIterator;
class VerFileIterator;
class DescFileIterator;
@@ -160,7 +192,15 @@ class pkgCache /*{{{*/
struct Flag
{
enum PkgFlags {Auto=(1<<0),Essential=(1<<3),Important=(1<<4)};
- enum PkgFFlags {NotSource=(1<<0),NotAutomatic=(1<<1),ButAutomaticUpgrades=(1<<2)};
+ enum PkgFFlags {
+ NotSource=(1<<0), /*!< packages can't be fetched from here, e.g. dpkg/status file */
+ LocalSource=(1<<1), /*!< local sources can't and will not be verified by hashes */
+ NoPackages=(1<<2), /*!< the file includes no package records itself, but additions like Translations */
+ };
+ enum ReleaseFileFlags {
+ NotAutomatic=(1<<0), /*!< archive has a default pin of 1 */
+ ButAutomaticUpgrades=(1<<1), /*!< (together with the previous) archive has a default pin of 100 */
+ };
};
protected:
@@ -180,11 +220,13 @@ class pkgCache /*{{{*/
Package *PkgP;
VerFile *VerFileP;
DescFile *DescFileP;
+ ReleaseFile *RlsFileP;
PackageFile *PkgFileP;
Version *VerP;
Description *DescP;
Provides *ProvideP;
Dependency *DepP;
+ APT_DEPRECATED StringItem *StringItemP;
char *StrP;
virtual bool ReMap(bool const &Errorchecks = true);
@@ -211,6 +253,8 @@ class pkgCache /*{{{*/
inline PkgIterator PkgEnd();
inline PkgFileIterator FileBegin();
inline PkgFileIterator FileEnd();
+ inline RlsFileIterator RlsFileBegin();
+ inline RlsFileIterator RlsFileEnd();
inline bool MultiArchCache() const { return MultiArchEnabled; }
inline char const * NativeArch();
@@ -222,11 +266,12 @@ class pkgCache /*{{{*/
static const char *CompTypeDeb(unsigned char Comp) APT_CONST;
static const char *CompType(unsigned char Comp) APT_CONST;
static const char *DepType(unsigned char Dep);
-
+
pkgCache(MMap *Map,bool DoMap = true);
- virtual ~pkgCache() {}
+ virtual ~pkgCache();
private:
+ void *d;
bool MultiArchEnabled;
APT_HIDDEN PkgIterator SingleArchFindPkg(const std::string &Name);
};
@@ -260,6 +305,7 @@ struct pkgCache::Header
unsigned short HeaderSz;
unsigned short GroupSz;
unsigned short PackageSz;
+ unsigned short ReleaseFileSz;
unsigned short PackageFileSz;
unsigned short VersionSz;
unsigned short DescriptionSz;
@@ -278,6 +324,7 @@ struct pkgCache::Header
map_id_t VersionCount;
map_id_t DescriptionCount;
map_id_t DependsCount;
+ map_fileid_t ReleaseFileCount;
map_fileid_t PackageFileCount;
map_fileid_t VerFileCount;
map_fileid_t DescFileCount;
@@ -288,12 +335,20 @@ struct pkgCache::Header
The PackageFile structures are singly linked lists that represent
all package files that have been merged into the cache. */
map_pointer_t FileList;
+ /** \brief index of the first ReleaseFile structure */
+ map_pointer_t RlsFileList;
+
+#if APT_PKG_ABI < 413
+ APT_DEPRECATED map_pointer_t StringList;
+#endif
/** \brief String representing the version system used */
map_pointer_t VerSysName;
/** \brief native architecture the cache was built against */
map_pointer_t Architecture;
+#if APT_PKG_ABI >= 413
/** \brief all architectures the cache was built against */
map_pointer_t Architectures;
+#endif
/** \brief The maximum size of a raw entry from the original Package file */
map_filesize_t MaxVerFileSize;
/** \brief The maximum size of a raw entry from the original Translation file */
@@ -319,12 +374,26 @@ struct pkgCache::Header
In the PkgHashTable is it possible that multiple packages have the same name -
these packages are stored as a sequence in the list.
The size of both tables is the same. */
+#if APT_PKG_ABI >= 413
unsigned int HashTableSize;
- map_pointer_t * PkgHashTable() const { return (map_pointer_t*) (this + 1); }
- map_pointer_t * GrpHashTable() const { return PkgHashTable() + HashTableSize; }
+ unsigned int GetHashTableSize() const { return HashTableSize; }
+ void SetHashTableSize(unsigned int const sz) { HashTableSize = sz; }
+ map_pointer_t GetArchitectures() const { return Architectures; }
+ void SetArchitectures(map_pointer_t const idx) { Architectures = idx; }
+#else
+ // BEWARE: these tables are pretty much empty and just here for abi compat
+ map_ptrloc PkgHashTable[2*1048];
+ map_ptrloc GrpHashTable[2*1048];
+ unsigned int GetHashTableSize() const { return PkgHashTable[0]; }
+ void SetHashTableSize(unsigned int const sz) { PkgHashTable[0] = sz; }
+ map_pointer_t GetArchitectures() const { return PkgHashTable[1]; }
+ void SetArchitectures(map_pointer_t const idx) { PkgHashTable[1] = idx; }
+#endif
+ map_pointer_t * PkgHashTableP() const { return (map_pointer_t*) (this + 1); }
+ map_pointer_t * GrpHashTableP() const { return PkgHashTableP() + GetHashTableSize(); }
/** \brief Size of the complete cache file */
- unsigned long long CacheFileSize;
+ should_be_uint64_small_t CacheFileSize;
bool CheckSizes(Header &Against) const APT_PURE;
Header();
@@ -350,7 +419,7 @@ struct pkgCache::Group
/** \brief Link to the next Group */
map_pointer_t Next; // Group
/** \brief unique sequel ID */
- map_id_t ID;
+ should_be_map_id_t ID;
};
/*}}}*/
@@ -387,12 +456,18 @@ struct pkgCache::Package
map_pointer_t VersionList; // Version
/** \brief index to the installed version */
map_pointer_t CurrentVer; // Version
+ /** \brief indicates nothing (consistently)
+ This field used to contain ONE section the package belongs to,
+ if those differs between versions it is a RANDOM one.
+ The Section() method tries to reproduce it, but the only sane
+ thing to do is use the Section field from the version! */
+ APT_DEPRECATED map_ptrloc Section; // StringItem
/** \brief index of the group this package belongs to */
map_pointer_t Group; // Group the Package belongs to
// Linked list
/** \brief Link to the next package in the same bucket */
- map_pointer_t Next; // Package
+ map_pointer_t NextPackage; // Package
/** \brief List of all dependencies on this package */
map_pointer_t RevDepends; // Dependency
/** \brief List of all "packages" this package provide */
@@ -416,20 +491,19 @@ struct pkgCache::Package
This allows clients to create an array of size PackageCount and use it to store
state information for the package map. For instance the status file emitter uses
this to track which packages have been emitted already. */
- map_id_t ID;
+ should_be_map_id_t ID;
/** \brief some useful indicators of the package's state */
unsigned long Flags;
};
/*}}}*/
-// Package File structure /*{{{*/
-/** \brief stores information about the files used to generate the cache
+// Release File structure /*{{{*/
+/** \brief stores information about the release files used to generate the cache
- Package files are referenced by Version structures to be able to know
- after the generation still from which Packages file includes this Version
- as we need this information later on e.g. for pinning. */
-struct pkgCache::PackageFile
+ PackageFiles reference ReleaseFiles as we need to keep record of which
+ version belongs to which release e.g. for pinning. */
+struct pkgCache::ReleaseFile
{
- /** \brief physical disk file that this PackageFile represents */
+ /** \brief physical disk file that this ReleaseFile represents */
map_stringitem_t FileName;
/** \brief the release information
@@ -437,13 +511,47 @@ struct pkgCache::PackageFile
release information means. */
map_stringitem_t Archive;
map_stringitem_t Codename;
- map_stringitem_t Component;
map_stringitem_t Version;
map_stringitem_t Origin;
map_stringitem_t Label;
- map_stringitem_t Architecture;
/** \brief The site the index file was fetched from */
map_stringitem_t Site;
+
+ /** \brief Size of the file
+
+ Used together with the modification time as a
+ simple check to ensure that the Packages
+ file has not been altered since Cache generation. */
+ map_filesize_t Size;
+ /** \brief Modification time for the file */
+ time_t mtime;
+
+ /** @TODO document PackageFile::Flags */
+ unsigned long Flags;
+
+ // Linked list
+ /** \brief Link to the next ReleaseFile in the Cache */
+ map_pointer_t NextFile;
+ /** \brief unique sequel ID */
+ should_be_map_fileid_t ID;
+};
+ /*}}}*/
+// Package File structure /*{{{*/
+/** \brief stores information about the files used to generate the cache
+
+ Package files are referenced by Version structures to be able to know
+ after the generation still from which Packages file includes this Version
+ as we need this information later on e.g. for pinning. */
+struct pkgCache::PackageFile
+{
+ /** \brief physical disk file that this PackageFile represents */
+ map_stringitem_t FileName;
+ /** \brief the release information */
+ map_pointer_t Release;
+
+ map_stringitem_t Component;
+ map_stringitem_t Architecture;
+
/** \brief indicates what sort of index file this is
@TODO enumerate at least the possible indexes */
@@ -464,7 +572,7 @@ struct pkgCache::PackageFile
/** \brief Link to the next PackageFile in the Cache */
map_pointer_t NextFile; // PackageFile
/** \brief unique sequel ID */
- map_fileid_t ID;
+ should_be_map_fileid_t ID;
};
/*}}}*/
// VerFile structure /*{{{*/
@@ -479,7 +587,7 @@ struct pkgCache::VerFile
/** \brief next step in the linked list */
map_pointer_t NextFile; // PkgVerFile
/** \brief position in the package file */
- map_filesize_t Offset; // File offset
+ should_be_map_filesize_t Offset; // File offset
/** @TODO document pkgCache::VerFile::Size */
map_filesize_t Size;
};
@@ -493,7 +601,7 @@ struct pkgCache::DescFile
/** \brief next step in the linked list */
map_pointer_t NextFile; // PkgVerFile
/** \brief position in the file */
- map_filesize_t Offset; // File offset
+ should_be_map_filesize_t Offset; // File offset
/** @TODO document pkgCache::DescFile::Size */
map_filesize_t Size;
};
@@ -510,12 +618,14 @@ struct pkgCache::Version
map_stringitem_t VerStr;
/** \brief section this version is filled in */
map_stringitem_t Section;
+#if APT_PKG_ABI >= 413
/** \brief source package name this version comes from
Always contains the name, even if it is the same as the binary name */
map_stringitem_t SourcePkgName;
/** \brief source version this version comes from
Always contains the version string, even if it is the same as the binary version */
map_stringitem_t SourceVerStr;
+#endif
/** \brief Multi-Arch capabilities of a package version */
enum VerMultiArch { None = 0, /*!< is the default and doesn't trigger special behaviour */
@@ -554,16 +664,16 @@ struct pkgCache::Version
/** \brief archive size for this version
For Debian this is the size of the .deb file. */
- uint64_t Size; // These are the .deb size
+ should_be_uint64_t Size; // These are the .deb size
/** \brief uncompressed size for this version */
- uint64_t InstalledSize;
+ should_be_uint64_t InstalledSize;
/** \brief characteristic value representing this version
No two packages in existence should have the same VerStr
and Hash with different contents. */
unsigned short Hash;
/** \brief unique sequel ID */
- map_id_t ID;
+ should_be_map_id_t ID;
/** \brief parsed priority value */
unsigned char Priority;
};
@@ -591,7 +701,7 @@ struct pkgCache::Description
map_pointer_t ParentPkg; // Package
/** \brief unique sequel ID */
- map_id_t ID;
+ should_be_map_id_t ID;
};
/*}}}*/
// Dependency structure /*{{{*/
@@ -618,7 +728,7 @@ struct pkgCache::Dependency
map_pointer_t ParentVer; // Version
/** \brief unique sequel ID */
- map_id_t ID;
+ should_be_map_id_t ID;
/** \brief Dependency type - Depends, Recommends, Conflicts, etc */
unsigned char Type;
/** \brief comparison operator specified on the depends line
@@ -654,6 +764,15 @@ struct pkgCache::Provides
map_pointer_t NextPkgProv; // Provides
};
/*}}}*/
+// UNUSED StringItem structure /*{{{*/
+struct APT_DEPRECATED pkgCache::StringItem
+{
+ /** \brief string this refers to */
+ map_ptrloc String; // StringItem
+ /** \brief Next link in the chain */
+ map_ptrloc NextItem; // StringItem
+};
+ /*}}}*/
inline char const * pkgCache::NativeArch()
{ return StrP + HeaderP->Architecture; }
@@ -672,6 +791,11 @@ inline pkgCache::PkgFileIterator pkgCache::FileBegin()
{return PkgFileIterator(*this,PkgFileP + HeaderP->FileList);}
inline pkgCache::PkgFileIterator pkgCache::FileEnd()
{return PkgFileIterator(*this,PkgFileP);}
+inline pkgCache::RlsFileIterator pkgCache::RlsFileBegin()
+ {return RlsFileIterator(*this,RlsFileP + HeaderP->RlsFileList);}
+inline pkgCache::RlsFileIterator pkgCache::RlsFileEnd()
+ {return RlsFileIterator(*this,RlsFileP);}
+
// Oh I wish for Real Name Space Support
class pkgCache::Namespace /*{{{*/
@@ -683,6 +807,7 @@ class pkgCache::Namespace /*{{{*/
typedef pkgCache::DescIterator DescIterator;
typedef pkgCache::DepIterator DepIterator;
typedef pkgCache::PrvIterator PrvIterator;
+ typedef pkgCache::RlsFileIterator RlsFileIterator;
typedef pkgCache::PkgFileIterator PkgFileIterator;
typedef pkgCache::VerFileIterator VerFileIterator;
typedef pkgCache::Version Version;
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 9e6931fa6..54e2ef19c 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -54,10 +54,8 @@ using std::string;
/* We set the dirty flag and make sure that is written to the disk */
pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) :
Map(*pMap), Cache(pMap,false), Progress(Prog),
- FoundFileDeps(0)
+ CurrentRlsFile(NULL), CurrentFile(NULL), FoundFileDeps(0)
{
- CurrentFile = 0;
-
if (_error->PendingError() == true)
return;
@@ -74,7 +72,7 @@ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) :
*Cache.HeaderP = pkgCache::Header();
// make room for the hashtables for packages and groups
- if (Map.RawAllocate(2 * (Cache.HeaderP->HashTableSize * sizeof(map_pointer_t))) == 0)
+ if (Map.RawAllocate(2 * (Cache.HeaderP->GetHashTableSize() * sizeof(map_pointer_t))) == 0)
return;
map_stringitem_t const idxVerSysName = WriteStringInMap(_system->VS->Label);
@@ -96,10 +94,10 @@ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) :
map_stringitem_t const idxArchitectures = WriteStringInMap(list);
if (unlikely(idxArchitectures == 0))
return;
- Cache.HeaderP->Architectures = idxArchitectures;
+ Cache.HeaderP->SetArchitectures(idxArchitectures);
}
else
- Cache.HeaderP->Architectures = idxArchitecture;
+ Cache.HeaderP->SetArchitectures(idxArchitecture);
Cache.ReMap();
}
@@ -145,6 +143,7 @@ void pkgCacheGenerator::ReMap(void const * const oldMap, void const * const newM
Cache.ReMap(false);
CurrentFile += (pkgCache::PackageFile const * const) newMap - (pkgCache::PackageFile const * const) oldMap;
+ CurrentRlsFile += (pkgCache::ReleaseFile const * const) newMap - (pkgCache::ReleaseFile const * const) oldMap;
for (std::vector<pkgCache::GrpIterator*>::const_iterator i = Dynamic<pkgCache::GrpIterator>::toReMap.begin();
i != Dynamic<pkgCache::GrpIterator>::toReMap.end(); ++i)
@@ -167,6 +166,9 @@ void pkgCacheGenerator::ReMap(void const * const oldMap, void const * const newM
for (std::vector<pkgCache::PkgFileIterator*>::const_iterator i = Dynamic<pkgCache::PkgFileIterator>::toReMap.begin();
i != Dynamic<pkgCache::PkgFileIterator>::toReMap.end(); ++i)
(*i)->ReMap(oldMap, newMap);
+ for (std::vector<pkgCache::RlsFileIterator*>::const_iterator i = Dynamic<pkgCache::RlsFileIterator>::toReMap.begin();
+ i != Dynamic<pkgCache::RlsFileIterator>::toReMap.end(); ++i)
+ (*i)->ReMap(oldMap, newMap);
} /*}}}*/
// CacheGenerator::WriteStringInMap /*{{{*/
map_stringitem_t pkgCacheGenerator::WriteStringInMap(const char *String,
@@ -616,7 +618,7 @@ bool pkgCacheGenerator::NewGroup(pkgCache::GrpIterator &Grp, const string &Name)
// Insert it into the hash table
unsigned long const Hash = Cache.Hash(Name);
- map_pointer_t *insertAt = &Cache.HeaderP->GrpHashTable()[Hash];
+ map_pointer_t *insertAt = &Cache.HeaderP->GrpHashTableP()[Hash];
while (*insertAt != 0 && strcasecmp(Name.c_str(), Cache.StrP + (Cache.GrpP + *insertAt)->Name) > 0)
insertAt = &(Cache.GrpP + *insertAt)->Next;
Grp->Next = *insertAt;
@@ -652,30 +654,23 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name
Grp->FirstPackage = Package;
// Insert it into the hash table
map_id_t const Hash = Cache.Hash(Name);
- map_pointer_t *insertAt = &Cache.HeaderP->PkgHashTable()[Hash];
+ map_pointer_t *insertAt = &Cache.HeaderP->PkgHashTableP()[Hash];
while (*insertAt != 0 && strcasecmp(Name.c_str(), Cache.StrP + (Cache.GrpP + (Cache.PkgP + *insertAt)->Group)->Name) > 0)
- insertAt = &(Cache.PkgP + *insertAt)->Next;
- Pkg->Next = *insertAt;
+ insertAt = &(Cache.PkgP + *insertAt)->NextPackage;
+ Pkg->NextPackage = *insertAt;
*insertAt = Package;
}
else // Group the Packages together
{
// this package is the new last package
pkgCache::PkgIterator LastPkg(Cache, Cache.PkgP + Grp->LastPackage);
- Pkg->Next = LastPkg->Next;
- LastPkg->Next = Package;
+ Pkg->NextPackage = LastPkg->NextPackage;
+ LastPkg->NextPackage = Package;
}
Grp->LastPackage = Package;
// Set the name, arch and the ID
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
- Pkg->Name = Grp->Name;
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+ APT_IGNORE_DEPRECATED(Pkg->Name = Grp->Name;)
Pkg->Group = Grp.Index();
// all is mapped to the native architecture
map_stringitem_t const idxArch = (Arch == "all") ? Cache.HeaderP->Architecture : StoreString(MIXED, Arch);
@@ -1079,13 +1074,48 @@ bool pkgCacheGenerator::ListParser::SameVersion(unsigned short const Hash,/*{{{*
return Hash == Ver->Hash;
}
/*}}}*/
+// CacheGenerator::SelectReleaseFile - Select the current release file the indexes belong to /*{{{*/
+bool pkgCacheGenerator::SelectReleaseFile(const string &File,const string &Site,
+ unsigned long Flags)
+{
+ if (File.empty() && Site.empty())
+ {
+ CurrentRlsFile = NULL;
+ return true;
+ }
+
+ // Get some space for the structure
+ map_pointer_t const idxFile = AllocateInMap(sizeof(*CurrentRlsFile));
+ if (unlikely(idxFile == 0))
+ return false;
+ CurrentRlsFile = Cache.RlsFileP + idxFile;
+
+ // Fill it in
+ map_stringitem_t const idxFileName = WriteStringInMap(File);
+ map_stringitem_t const idxSite = StoreString(MIXED, Site);
+ if (unlikely(idxFileName == 0 || idxSite == 0))
+ return false;
+ CurrentRlsFile->FileName = idxFileName;
+ CurrentRlsFile->Site = idxSite;
+ CurrentRlsFile->NextFile = Cache.HeaderP->RlsFileList;
+ CurrentRlsFile->Flags = Flags;
+ CurrentRlsFile->ID = Cache.HeaderP->ReleaseFileCount;
+ RlsFileName = File;
+ Cache.HeaderP->RlsFileList = CurrentRlsFile - Cache.RlsFileP;
+ Cache.HeaderP->ReleaseFileCount++;
+
+ return true;
+}
+ /*}}}*/
// CacheGenerator::SelectFile - Select the current file being parsed /*{{{*/
// ---------------------------------------------------------------------
/* This is used to select which file is to be associated with all newly
added versions. The caller is responsible for setting the IMS fields. */
-bool pkgCacheGenerator::SelectFile(const string &File,const string &Site,
- const pkgIndexFile &Index,
- unsigned long Flags)
+bool pkgCacheGenerator::SelectFile(std::string const &File,
+ pkgIndexFile const &Index,
+ std::string const &Architecture,
+ std::string const &Component,
+ unsigned long const Flags)
{
// Get some space for the structure
map_pointer_t const idxFile = AllocateInMap(sizeof(*CurrentFile));
@@ -1095,18 +1125,33 @@ bool pkgCacheGenerator::SelectFile(const string &File,const string &Site,
// Fill it in
map_stringitem_t const idxFileName = WriteStringInMap(File);
- map_stringitem_t const idxSite = StoreString(MIXED, Site);
- if (unlikely(idxFileName == 0 || idxSite == 0))
+ if (unlikely(idxFileName == 0))
return false;
CurrentFile->FileName = idxFileName;
- CurrentFile->Site = idxSite;
CurrentFile->NextFile = Cache.HeaderP->FileList;
- CurrentFile->Flags = Flags;
CurrentFile->ID = Cache.HeaderP->PackageFileCount;
map_stringitem_t const idxIndexType = StoreString(MIXED, Index.GetType()->Label);
if (unlikely(idxIndexType == 0))
return false;
CurrentFile->IndexType = idxIndexType;
+ if (Architecture.empty())
+ CurrentFile->Architecture = 0;
+ else
+ {
+ map_stringitem_t const arch = StoreString(pkgCacheGenerator::MIXED, Architecture);
+ if (unlikely(arch == 0))
+ return false;
+ CurrentFile->Architecture = arch;
+ }
+ map_stringitem_t const component = StoreString(pkgCacheGenerator::MIXED, Component);
+ if (unlikely(component == 0))
+ return false;
+ CurrentFile->Component = component;
+ CurrentFile->Flags = Flags;
+ if (CurrentRlsFile != NULL)
+ CurrentFile->Release = CurrentRlsFile - Cache.RlsFileP;
+ else
+ CurrentFile->Release = 0;
PkgFileName = File;
Cache.HeaderP->FileList = CurrentFile - Cache.PkgFileP;
Cache.HeaderP->PackageFileCount++;
@@ -1181,35 +1226,59 @@ static bool CheckValidity(const string &CacheFile,
_error->Discard();
return false;
}
-
+
+ SPtrArray<bool> RlsVisited = new bool[Cache.HeaderP->ReleaseFileCount];
+ memset(RlsVisited,0,sizeof(*RlsVisited)*Cache.HeaderP->ReleaseFileCount);
+ std::vector<pkgIndexFile *> Files;
+ for (pkgSourceList::const_iterator i = List.begin(); i != List.end(); ++i)
+ {
+ if (Debug == true)
+ std::clog << "Checking RlsFile " << (*i)->Describe() << ": ";
+ pkgCache::RlsFileIterator const RlsFile = (*i)->FindInCache(Cache, true);
+ if (RlsFile.end() == true)
+ {
+ if (Debug == true)
+ std::clog << "FindInCache returned end-Pointer" << std::endl;
+ return false;
+ }
+
+ RlsVisited[RlsFile->ID] = true;
+ if (Debug == true)
+ std::clog << "with ID " << RlsFile->ID << " is valid" << std::endl;
+
+ std::vector <pkgIndexFile *> *Indexes = (*i)->GetIndexFiles();
+ for (std::vector<pkgIndexFile *>::const_iterator j = Indexes->begin(); j != Indexes->end(); ++j)
+ if ((*j)->HasPackages())
+ Files.push_back (*j);
+ }
+ for (unsigned I = 0; I != Cache.HeaderP->ReleaseFileCount; ++I)
+ if (RlsVisited[I] == false)
+ {
+ if (Debug == true)
+ std::clog << "RlsFile with ID" << I << " wasn't visited" << std::endl;
+ return false;
+ }
+
+ for (; Start != End; ++Start)
+ Files.push_back(*Start);
+
/* Now we check every index file, see if it is in the cache,
verify the IMS data and check that it is on the disk too.. */
SPtrArray<bool> Visited = new bool[Cache.HeaderP->PackageFileCount];
memset(Visited,0,sizeof(*Visited)*Cache.HeaderP->PackageFileCount);
- for (; Start != End; ++Start)
+ for (std::vector<pkgIndexFile *>::const_reverse_iterator PkgFile = Files.rbegin(); PkgFile != Files.rend(); ++PkgFile)
{
if (Debug == true)
- std::clog << "Checking PkgFile " << (*Start)->Describe() << ": ";
- if ((*Start)->HasPackages() == false)
- {
- if (Debug == true)
- std::clog << "Has NO packages" << std::endl;
- continue;
- }
-
- if ((*Start)->Exists() == false)
+ std::clog << "Checking PkgFile " << (*PkgFile)->Describe() << ": ";
+ if ((*PkgFile)->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
if (Debug == true)
std::clog << "file doesn't exist" << std::endl;
continue;
}
// FindInCache is also expected to do an IMS check.
- pkgCache::PkgFileIterator File = (*Start)->FindInCache(Cache);
+ pkgCache::PkgFileIterator File = (*PkgFile)->FindInCache(Cache);
if (File.end() == true)
{
if (Debug == true)
@@ -1221,15 +1290,15 @@ static bool CheckValidity(const string &CacheFile,
if (Debug == true)
std::clog << "with ID " << File->ID << " is valid" << std::endl;
}
-
+
for (unsigned I = 0; I != Cache.HeaderP->PackageFileCount; I++)
if (Visited[I] == false)
{
if (Debug == true)
- std::clog << "File with ID" << I << " wasn't visited" << std::endl;
+ std::clog << "PkgFile with ID" << I << " wasn't visited" << std::endl;
return false;
}
-
+
if (_error->PendingError() == true)
{
if (Debug == true)
@@ -1250,9 +1319,20 @@ static bool CheckValidity(const string &CacheFile,
// ---------------------------------------------------------------------
/* Size is kind of an abstract notion that is only used for the progress
meter */
-static map_filesize_t ComputeSize(FileIterator Start,FileIterator End)
+static map_filesize_t ComputeSize(pkgSourceList const * const List, FileIterator Start,FileIterator End)
{
map_filesize_t TotalSize = 0;
+ if (List != NULL)
+ {
+ for (pkgSourceList::const_iterator i = List->begin(); i != List->end(); ++i)
+ {
+ std::vector <pkgIndexFile *> *Indexes = (*i)->GetIndexFiles();
+ for (std::vector<pkgIndexFile *>::const_iterator j = Indexes->begin(); j != Indexes->end(); ++j)
+ if ((*j)->HasPackages() == true)
+ TotalSize += (*j)->Size();
+ }
+ }
+
for (; Start < End; ++Start)
{
if ((*Start)->HasPackages() == false)
@@ -1268,11 +1348,63 @@ static map_filesize_t ComputeSize(FileIterator Start,FileIterator End)
static bool BuildCache(pkgCacheGenerator &Gen,
OpProgress *Progress,
map_filesize_t &CurrentSize,map_filesize_t TotalSize,
+ pkgSourceList const * const List,
FileIterator Start, FileIterator End)
{
+ std::vector<pkgIndexFile *> Files;
+ bool const HasFileDeps = Gen.HasFileDeps();
+
+ if (List != NULL)
+ {
+ for (pkgSourceList::const_iterator i = List->begin(); i != List->end(); ++i)
+ {
+ if ((*i)->FindInCache(Gen.GetCache(), false).end() == false)
+ {
+ _error->Warning("Duplicate sources.list entry %s",
+ (*i)->Describe().c_str());
+ continue;
+ }
+
+ if ((*i)->Merge(Gen, Progress) == false)
+ return false;
+
+ std::vector <pkgIndexFile *> *Indexes = (*i)->GetIndexFiles();
+ for (std::vector<pkgIndexFile *>::const_iterator I = Indexes->begin(); I != Indexes->end(); ++I)
+ {
+ if (HasFileDeps)
+ Files.push_back(*I);
+
+ if ((*I)->HasPackages() == false)
+ continue;
+
+ if ((*I)->Exists() == false)
+ continue;
+
+ if ((*I)->FindInCache(Gen.GetCache()).end() == false)
+ {
+ _error->Warning("Duplicate sources.list entry %s",
+ (*I)->Describe().c_str());
+ continue;
+ }
+
+ map_filesize_t Size = (*I)->Size();
+ if (Progress != NULL)
+ Progress->OverallProgress(CurrentSize,TotalSize,Size,_("Reading package lists"));
+ CurrentSize += Size;
+
+ if ((*I)->Merge(Gen,Progress) == false)
+ return false;
+ }
+ }
+ }
+
+ Gen.SelectReleaseFile("", "");
FileIterator I;
for (I = Start; I != End; ++I)
{
+ if (HasFileDeps)
+ Files.push_back(*I);
+
if ((*I)->HasPackages() == false)
continue;
@@ -1295,13 +1427,13 @@ static bool BuildCache(pkgCacheGenerator &Gen,
return false;
}
- if (Gen.HasFileDeps() == true)
+ if (HasFileDeps == true)
{
if (Progress != NULL)
Progress->Done();
- TotalSize = ComputeSize(Start, End);
+ TotalSize = ComputeSize(List, Start, End);
CurrentSize = 0;
- for (I = Start; I != End; ++I)
+ for (std::vector<pkgIndexFile *>::const_iterator I = Files.begin(); I != Files.end(); ++I)
{
map_filesize_t Size = (*I)->Size();
if (Progress != NULL)
@@ -1346,6 +1478,7 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
bool const Debug = _config->FindB("Debug::pkgCacheGen", false);
std::vector<pkgIndexFile *> Files;
+ /*
for (std::vector<metaIndex *>::const_iterator i = List.begin();
i != List.end();
++i)
@@ -1356,8 +1489,7 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
++j)
Files.push_back (*j);
}
-
- map_filesize_t const EndOfSource = Files.size();
+*/
if (_system->AddStatusFiles(Files) == false)
return false;
@@ -1449,8 +1581,8 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
// Lets try the source cache.
map_filesize_t CurrentSize = 0;
map_filesize_t TotalSize = 0;
- if (CheckValidity(SrcCacheFile, List, Files.begin(),
- Files.begin()+EndOfSource) == true)
+ if (CheckValidity(SrcCacheFile, List, Files.end(),
+ Files.end()) == true)
{
if (Debug == true)
std::clog << "srcpkgcache.bin is valid - populate MMap with it." << std::endl;
@@ -1462,28 +1594,28 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
SCacheF.Size()) == false)
return false;
- TotalSize = ComputeSize(Files.begin()+EndOfSource,Files.end());
+ TotalSize = ComputeSize(NULL, Files.begin(), Files.end());
// Build the status cache
pkgCacheGenerator Gen(Map.Get(),Progress);
if (_error->PendingError() == true)
return false;
- if (BuildCache(Gen,Progress,CurrentSize,TotalSize,
- Files.begin()+EndOfSource,Files.end()) == false)
+ if (BuildCache(Gen, Progress, CurrentSize, TotalSize, NULL,
+ Files.begin(),Files.end()) == false)
return false;
}
else
{
if (Debug == true)
std::clog << "srcpkgcache.bin is NOT valid - rebuild" << std::endl;
- TotalSize = ComputeSize(Files.begin(),Files.end());
+ TotalSize = ComputeSize(&List, Files.begin(),Files.end());
// Build the source cache
pkgCacheGenerator Gen(Map.Get(),Progress);
if (_error->PendingError() == true)
return false;
- if (BuildCache(Gen,Progress,CurrentSize,TotalSize,
- Files.begin(),Files.begin()+EndOfSource) == false)
+ if (BuildCache(Gen, Progress, CurrentSize, TotalSize, &List,
+ Files.end(),Files.end()) == false)
return false;
// Write it back
@@ -1510,8 +1642,8 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
}
// Build the status cache
- if (BuildCache(Gen,Progress,CurrentSize,TotalSize,
- Files.begin()+EndOfSource,Files.end()) == false)
+ if (BuildCache(Gen, Progress, CurrentSize, TotalSize, NULL,
+ Files.begin(), Files.end()) == false)
return false;
}
if (Debug == true)
@@ -1543,7 +1675,6 @@ APT_DEPRECATED bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **Ou
bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap)
{
std::vector<pkgIndexFile *> Files;
- map_filesize_t EndOfSource = Files.size();
if (_system->AddStatusFiles(Files) == false)
return false;
@@ -1551,7 +1682,7 @@ bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **O
map_filesize_t CurrentSize = 0;
map_filesize_t TotalSize = 0;
- TotalSize = ComputeSize(Files.begin()+EndOfSource,Files.end());
+ TotalSize = ComputeSize(NULL, Files.begin(), Files.end());
// Build the status cache
if (Progress != NULL)
@@ -1559,8 +1690,8 @@ bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **O
pkgCacheGenerator Gen(Map.Get(),Progress);
if (_error->PendingError() == true)
return false;
- if (BuildCache(Gen,Progress,CurrentSize,TotalSize,
- Files.begin()+EndOfSource,Files.end()) == false)
+ if (BuildCache(Gen,Progress,CurrentSize,TotalSize, NULL,
+ Files.begin(), Files.end()) == false)
return false;
if (_error->PendingError() == true)
@@ -1589,3 +1720,6 @@ bool pkgCacheGenerator::FinishCache(OpProgress * /*Progress*/)
return true;
}
/*}}}*/
+
+pkgCacheGenerator::ListParser::ListParser() : Owner(NULL), OldDepLast(NULL), FoundFileDeps(false) {}
+pkgCacheGenerator::ListParser::~ListParser() {}
diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index 54c4f9e7a..3c1a40972 100644
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -1,6 +1,5 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: pkgcachegen.h,v 1.19 2002/07/08 03:13:30 jgg Exp $
/* ######################################################################
Package Cache Generator - Generator for the cache structure.
@@ -34,7 +33,7 @@ class pkgSourceList;
class OpProgress;
class pkgIndexFile;
-class pkgCacheGenerator /*{{{*/
+class APT_HIDDEN pkgCacheGenerator /*{{{*/
{
private:
APT_HIDDEN map_stringitem_t WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); };
@@ -69,7 +68,9 @@ class pkgCacheGenerator /*{{{*/
DynamicMMap &Map;
pkgCache Cache;
OpProgress *Progress;
-
+
+ std::string RlsFileName;
+ pkgCache::ReleaseFile *CurrentRlsFile;
std::string PkgFileName;
pkgCache::PackageFile *CurrentFile;
@@ -100,28 +101,31 @@ class pkgCacheGenerator /*{{{*/
inline map_stringitem_t StoreString(enum StringType const type, const std::string &S) {return StoreString(type, S.c_str(),S.length());};
void DropProgress() {Progress = 0;};
- bool SelectFile(const std::string &File,const std::string &Site,pkgIndexFile const &Index,
- unsigned long Flags = 0);
+ bool SelectFile(const std::string &File,pkgIndexFile const &Index, std::string const &Architecture, std::string const &Component, unsigned long Flags = 0);
+ bool SelectReleaseFile(const std::string &File, const std::string &Site, unsigned long Flags = 0);
bool MergeList(ListParser &List,pkgCache::VerIterator *Ver = 0);
inline pkgCache &GetCache() {return Cache;};
inline pkgCache::PkgFileIterator GetCurFile()
{return pkgCache::PkgFileIterator(Cache,CurrentFile);};
+ inline pkgCache::RlsFileIterator GetCurRlsFile()
+ {return pkgCache::RlsFileIterator(Cache,CurrentRlsFile);};
bool HasFileDeps() {return FoundFileDeps;};
bool MergeFileProvides(ListParser &List);
bool FinishCache(OpProgress *Progress) APT_DEPRECATED APT_CONST;
- static bool MakeStatusCache(pkgSourceList &List,OpProgress *Progress,
+ APT_PUBLIC static bool MakeStatusCache(pkgSourceList &List,OpProgress *Progress,
MMap **OutMap = 0,bool AllowMem = false);
- static bool MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap);
- static DynamicMMap* CreateDynamicMMap(FileFd *CacheF, unsigned long Flags = 0);
+ APT_PUBLIC static bool MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap);
+ APT_PUBLIC static DynamicMMap* CreateDynamicMMap(FileFd *CacheF, unsigned long Flags = 0);
void ReMap(void const * const oldMap, void const * const newMap);
pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress);
- ~pkgCacheGenerator();
+ virtual ~pkgCacheGenerator();
private:
+ void *d;
APT_HIDDEN bool MergeListGroup(ListParser &List, std::string const &GrpName);
APT_HIDDEN bool MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg);
APT_HIDDEN bool MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg,
@@ -136,7 +140,7 @@ class pkgCacheGenerator /*{{{*/
};
/*}}}*/
// This is the abstract package list parser class. /*{{{*/
-class pkgCacheGenerator::ListParser
+class APT_HIDDEN pkgCacheGenerator::ListParser
{
pkgCacheGenerator *Owner;
friend class pkgCacheGenerator;
@@ -147,7 +151,9 @@ class pkgCacheGenerator::ListParser
// Flag file dependencies
bool FoundFileDeps;
-
+
+ void *d;
+
protected:
inline map_stringitem_t StoreString(pkgCacheGenerator::StringType const type, std::string const &S) {return Owner->StoreString(type, S);};
@@ -178,10 +184,7 @@ class pkgCacheGenerator::ListParser
* \param Hash of the currently parsed version
* \param Ver to compare with
*/
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
- virtual
-#endif
- APT_PURE bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver);
+ virtual bool SameVersion(unsigned short const Hash, pkgCache::VerIterator const &Ver);
virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
pkgCache::VerIterator &Ver) = 0;
virtual map_filesize_t Offset() = 0;
@@ -193,8 +196,8 @@ class pkgCacheGenerator::ListParser
virtual bool CollectFileProvides(pkgCache &/*Cache*/,
pkgCache::VerIterator &/*Ver*/) {return true;};
- ListParser() : Owner(NULL), OldDepLast(NULL), FoundFileDeps(false) {};
- virtual ~ListParser() {};
+ ListParser();
+ virtual ~ListParser();
};
/*}}}*/
diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc
index 859af3a09..87c965f87 100644
--- a/apt-pkg/pkgrecords.cc
+++ b/apt-pkg/pkgrecords.cc
@@ -76,3 +76,6 @@ pkgRecords::Parser &pkgRecords::Lookup(pkgCache::DescFileIterator const &Desc)
return *Files[Desc.File()->ID];
}
/*}}}*/
+
+pkgRecords::Parser::Parser() {}
+pkgRecords::Parser::~Parser() {}
diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index a902da8b8..66eb17857 100644
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -43,7 +43,7 @@ class pkgRecords /*{{{*/
// Construct destruct
pkgRecords(pkgCache &Cache);
- ~pkgRecords();
+ virtual ~pkgRecords();
};
/*}}}*/
class pkgRecords::Parser /*{{{*/
@@ -68,10 +68,17 @@ class pkgRecords::Parser /*{{{*/
* choose the hash to be used.
*/
virtual HashStringList Hashes() const { return HashStringList(); };
+#if APT_PKG_ABI >= 413
APT_DEPRECATED std::string MD5Hash() const { return GetHashFromHashes("MD5Sum"); };
APT_DEPRECATED std::string SHA1Hash() const { return GetHashFromHashes("SHA1"); };
APT_DEPRECATED std::string SHA256Hash() const { return GetHashFromHashes("SHA256"); };
APT_DEPRECATED std::string SHA512Hash() const { return GetHashFromHashes("SHA512"); };
+#else
+ APT_DEPRECATED std::string MD5Hash() { return GetHashFromHashes("MD5Sum"); };
+ APT_DEPRECATED std::string SHA1Hash() { return GetHashFromHashes("SHA1"); };
+ APT_DEPRECATED std::string SHA256Hash() { return GetHashFromHashes("SHA256"); };
+ APT_DEPRECATED std::string SHA512Hash() { return GetHashFromHashes("SHA512"); };
+#endif
// These are some general stats about the package
virtual std::string Maintainer() {return std::string();};
@@ -99,10 +106,12 @@ class pkgRecords::Parser /*{{{*/
// The record in binary form
virtual void GetRec(const char *&Start,const char *&Stop) {Start = Stop = 0;};
-
- virtual ~Parser() {};
+
+ Parser();
+ virtual ~Parser();
private:
+ void *d;
APT_HIDDEN std::string GetHashFromHashes(char const * const type) const
{
HashStringList const hashes = Hashes();
diff --git a/apt-pkg/pkgsystem.cc b/apt-pkg/pkgsystem.cc
index 14d090c7a..98daeb2b9 100644
--- a/apt-pkg/pkgsystem.cc
+++ b/apt-pkg/pkgsystem.cc
@@ -45,3 +45,5 @@ APT_PURE pkgSystem *pkgSystem::GetSystem(const char *Label)
return 0;
}
/*}}}*/
+
+pkgSystem::~pkgSystem() {}
diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h
index f88ffa7c8..3a447da8b 100644
--- a/apt-pkg/pkgsystem.h
+++ b/apt-pkg/pkgsystem.h
@@ -1,6 +1,5 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: pkgsystem.h,v 1.6 2002/11/11 06:55:50 doogie Exp $
/* ######################################################################
System - Abstraction for running on different systems.
@@ -93,7 +92,9 @@ class pkgSystem
};
pkgSystem();
- virtual ~pkgSystem() {};
+ virtual ~pkgSystem();
+ private:
+ void *d;
};
// The environment we are operating in.
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 3cfc32829..6da6ed606 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -4,22 +4,12 @@
/* ######################################################################
Package Version Policy implementation
-
+
This is just a really simple wrapper around pkgVersionMatch with
some added goodies to manage the list of things..
-
- Priority Table:
-
- 1000 -> inf = Downgradeable priorities
- 1000 = The 'no downgrade' pseduo-status file
- 100 -> 1000 = Standard priorities
- 990 = Config file override package files
- 989 = Start for preference auto-priorities
- 500 = Default package files
- 100 = The status file and ButAutomaticUpgrades sources
- 0 -> 100 = NotAutomatic sources like experimental
- -inf -> 0 = Never selected
-
+
+ See man apt_preferences for what value means what.
+
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
@@ -56,7 +46,7 @@ using namespace std;
file matches the V0 policy engine. */
pkgPolicy::pkgPolicy(pkgCache *Owner) : Pins(0), PFPriority(0), Cache(Owner)
{
- if (Owner == 0 || &(Owner->Head()) == 0)
+ if (Owner == 0)
return;
PFPriority = new signed short[Owner->Head().PackageFileCount];
Pins = new Pin[Owner->Head().PackageCount];
@@ -73,9 +63,9 @@ pkgPolicy::pkgPolicy(pkgCache *Owner) : Pins(0), PFPriority(0), Cache(Owner)
pkgVersionMatch vm("", pkgVersionMatch::None);
for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); ++F)
{
- if ((F->Archive != 0 && vm.ExpressionMatches(DefRel, F.Archive()) == true) ||
- (F->Codename != 0 && vm.ExpressionMatches(DefRel, F.Codename()) == true) ||
- (F->Version != 0 && vm.ExpressionMatches(DefRel, F.Version()) == true) ||
+ if (vm.ExpressionMatches(DefRel, F.Archive()) ||
+ vm.ExpressionMatches(DefRel, F.Codename()) ||
+ vm.ExpressionMatches(DefRel, F.Version()) ||
(DefRel.length() > 2 && DefRel[1] == '='))
found = true;
}
@@ -96,48 +86,40 @@ bool pkgPolicy::InitDefaults()
for (pkgCache::PkgFileIterator I = Cache->FileBegin(); I != Cache->FileEnd(); ++I)
{
PFPriority[I->ID] = 500;
- if ((I->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource)
+ if (I.Flagged(pkgCache::Flag::NotSource))
PFPriority[I->ID] = 100;
- else if ((I->Flags & pkgCache::Flag::ButAutomaticUpgrades) == pkgCache::Flag::ButAutomaticUpgrades)
+ else if (I.Flagged(pkgCache::Flag::ButAutomaticUpgrades))
PFPriority[I->ID] = 100;
- else if ((I->Flags & pkgCache::Flag::NotAutomatic) == pkgCache::Flag::NotAutomatic)
+ else if (I.Flagged(pkgCache::Flag::NotAutomatic))
PFPriority[I->ID] = 1;
}
// Apply the defaults..
SPtrArray<bool> Fixed = new bool[Cache->HeaderP->PackageFileCount];
memset(Fixed,0,sizeof(*Fixed)*Cache->HeaderP->PackageFileCount);
- signed Cur = 989;
StatusOverride = false;
- for (vector<Pin>::const_iterator I = Defaults.begin(); I != Defaults.end();
- ++I, --Cur)
+ for (vector<Pin>::const_iterator I = Defaults.begin(); I != Defaults.end(); ++I)
{
pkgVersionMatch Match(I->Data,I->Type);
for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); ++F)
{
- if (Match.FileMatch(F) == true && Fixed[F->ID] == false)
+ if (Fixed[F->ID] == false && Match.FileMatch(F) == true)
{
- if (I->Priority != 0 && I->Priority > 0)
- Cur = I->Priority;
-
- if (I->Priority < 0)
- PFPriority[F->ID] = I->Priority;
- else
- PFPriority[F->ID] = Cur;
-
- if (PFPriority[F->ID] > 1000)
+ PFPriority[F->ID] = I->Priority;
+
+ if (PFPriority[F->ID] >= 1000)
StatusOverride = true;
-
+
Fixed[F->ID] = true;
- }
- }
+ }
+ }
}
if (_config->FindB("Debug::pkgPolicy",false) == true)
for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); ++F)
- std::clog << "Prio of " << F.FileName() << ' ' << PFPriority[F->ID] << std::endl;
-
- return true;
+ std::clog << "Prio of " << F.FileName() << ' ' << PFPriority[F->ID] << std::endl;
+
+ return true;
}
/*}}}*/
// Policy::GetCandidateVer - Get the candidate install version /*{{{*/
@@ -166,9 +148,7 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const &Pk
effectively excludes everything <= 0 which are the non-automatic
priorities.. The status file is given a prio of 100 which will exclude
not-automatic sources, except in a single shot not-installed mode.
- The second pseduo-status file is at prio 1000, above which will permit
- the user to force-downgrade things.
-
+
The user pin is subject to the same priority rules as default
selections. Thus there are two ways to create a pin - a pin that
tracks the default when the default is taken away, and a permanent
@@ -190,8 +170,7 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const &Pk
then it is not a candidate for installation, ever. This weeds
out bogus entries that may be due to config-file states, or
other. */
- if ((VF.File()->Flags & pkgCache::Flag::NotSource) == pkgCache::Flag::NotSource &&
- instVer == false)
+ if (VF.File().Flagged(pkgCache::Flag::NotSource) && instVer == false)
continue;
signed Prio = PFPriority[VF.File()->ID];
@@ -218,9 +197,9 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const &Pk
Pref = Ver;
PrefSeen = true;
}
- /* Elevate our current selection (or the status file itself)
- to the Pseudo-status priority. */
- Max = 1000;
+ /* Elevate our current selection (or the status file itself) so that only
+ a downgrade can override it from now on */
+ Max = 999;
// Fast path optimize.
if (StatusOverride == false)
@@ -336,13 +315,7 @@ pkgCache::VerIterator pkgPolicy::GetMatch(pkgCache::PkgIterator const &Pkg)
APT_PURE signed short pkgPolicy::GetPriority(pkgCache::PkgIterator const &Pkg)
{
if (Pins[Pkg->ID].Type != pkgVersionMatch::None)
- {
- // In this case 0 means default priority
- if (Pins[Pkg->ID].Priority == 0)
- return 989;
return Pins[Pkg->ID].Priority;
- }
-
return 0;
}
APT_PURE signed short pkgPolicy::GetPriority(pkgCache::PkgFileIterator const &File)
@@ -466,3 +439,5 @@ bool ReadPinFile(pkgPolicy &Plcy,string File)
return true;
}
/*}}}*/
+
+pkgPolicy::~pkgPolicy() {delete [] PFPriority; delete [] Pins;}
diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index f15d8c0a0..c4b1cbadd 100644
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -1,6 +1,5 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: policy.h,v 1.4 2001/05/07 04:24:08 jgg Exp $
/* ######################################################################
Package Version Policy implementation
@@ -85,7 +84,9 @@ class pkgPolicy : public pkgDepCache::Policy
bool InitDefaults();
pkgPolicy(pkgCache *Owner);
- virtual ~pkgPolicy() {delete [] PFPriority; delete [] Pins;};
+ virtual ~pkgPolicy();
+ private:
+ void *d;
};
bool ReadPinFile(pkgPolicy &Plcy, std::string File = "");
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 7170e8b5b..8b960572b 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -331,7 +331,7 @@ bool pkgSourceList::ParseFileOldStyle(string File)
{
// Open the stream for reading
ifstream F(File.c_str(),ios::in /*| ios::nocreate*/);
- if (!F != 0)
+ if (F.fail() == true)
return _error->Errno("ifstream::ifstream",_("Opening %s"),File.c_str());
// CNC:2003-12-10 - 300 is too short.
diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index 35b786e1a..c92643829 100644
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -1,6 +1,5 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: sourcelist.h,v 1.12.2.1 2003/12/24 23:09:17 mdz Exp $
/* ######################################################################
SourceList - Manage a list of sources
@@ -52,23 +51,16 @@ class pkgAcquire;
class pkgIndexFile;
class metaIndex;
-class pkgSource
-{
- protected:
-
- std::vector<metaIndex *> SrcList;
-
-};
-
-class pkgSourceList : public pkgSource
+class pkgSourceList
{
+ void *d;
public:
-
+
// List of supported source list types
class Type
{
public:
-
+
// Global list of Items supported
static Type **GlobalList;
static unsigned long GlobalListLen;
@@ -91,14 +83,18 @@ class pkgSourceList : public pkgSource
Type();
virtual ~Type() {};
};
-
+
typedef std::vector<metaIndex *>::const_iterator const_iterator;
-
- public:
+
+ protected:
+
+ std::vector<metaIndex *> SrcList;
int ParseFileDeb822(std::string File);
bool ParseFileOldStyle(std::string File);
+ public:
+
bool ReadMainList();
bool Read(std::string File);
@@ -122,7 +118,7 @@ class pkgSourceList : public pkgSource
pkgSourceList();
pkgSourceList(std::string File);
- ~pkgSourceList();
+ virtual ~pkgSourceList();
};
#endif
diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc
index 81b1c545d..3175ee75f 100644
--- a/apt-pkg/srcrecords.cc
+++ b/apt-pkg/srcrecords.cc
@@ -14,6 +14,7 @@
#include<config.h>
#include <apt-pkg/srcrecords.h>
+#include <apt-pkg/debsrcrecords.h>
#include <apt-pkg/error.h>
#include <apt-pkg/sourcelist.h>
#include <apt-pkg/metaindex.h>
@@ -147,5 +148,33 @@ const char *pkgSrcRecords::Parser::BuildDepType(unsigned char const &Type)
return fields[Type];
}
/*}}}*/
+bool pkgSrcRecords::Parser::Files2(std::vector<pkgSrcRecords::File2> &F2)/*{{{*/
+{
+ debSrcRecordParser * const deb = dynamic_cast<debSrcRecordParser*>(this);
+ if (deb != NULL)
+ return deb->Files2(F2);
-
+ std::vector<pkgSrcRecords::File> F;
+ if (Files(F) == false)
+ return false;
+ for (std::vector<pkgSrcRecords::File>::const_iterator f = F.begin(); f != F.end(); ++f)
+ {
+ pkgSrcRecords::File2 f2;
+#if __GNUC__ >= 4
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+ f2.MD5Hash = f->MD5Hash;
+ f2.Size = f->Size;
+ f2.Hashes.push_back(HashString("MD5Sum", f->MD5Hash));
+ f2.FileSize = f->Size;
+#if __GNUC__ >= 4
+ #pragma GCC diagnostic pop
+#endif
+ f2.Path = f->Path;
+ f2.Type = f->Type;
+ F2.push_back(f2);
+ }
+ return true;
+}
+ /*}}}*/
diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index c68d374bb..dda66ce48 100644
--- a/apt-pkg/srcrecords.h
+++ b/apt-pkg/srcrecords.h
@@ -1,6 +1,5 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: srcrecords.h,v 1.8.2.1 2003/12/26 16:27:34 mdz Exp $
/* ######################################################################
Source Package Records - Allows access to source package records
@@ -30,23 +29,21 @@ class pkgSrcRecords
{
public:
-#if __GNUC__ >= 4
- // ensure that con- & de-structor don't trigger this warning
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
// Describes a single file
struct File
{
+ APT_DEPRECATED std::string MD5Hash;
+ APT_DEPRECATED unsigned long Size;
std::string Path;
std::string Type;
- unsigned long long Size;
+ };
+ struct File2 : public File
+ {
+ unsigned long long FileSize;
HashStringList Hashes;
- APT_DEPRECATED std::string MD5Hash;
};
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
// Abstract parser for each source record
class Parser
@@ -87,6 +84,7 @@ class pkgSrcRecords
static const char *BuildDepType(unsigned char const &Type) APT_PURE;
virtual bool Files(std::vector<pkgSrcRecords::File> &F) = 0;
+ bool Files2(std::vector<pkgSrcRecords::File2> &F);
Parser(const pkgIndexFile *Index) : iIndex(Index) {};
virtual ~Parser() {};
diff --git a/apt-pkg/tagfile-order.c b/apt-pkg/tagfile-order.c
new file mode 100644
index 000000000..10c61ab94
--- /dev/null
+++ b/apt-pkg/tagfile-order.c
@@ -0,0 +1,109 @@
+/* In this file is the order defined in which e.g. apt-ftparchive will write stanzas in.
+ Other commands might or might not use this. 'apt-cache show' e.g. does NOT!
+
+ The order we chose here is inspired by both dpkg and dak.
+ The testcase test/integration/test-apt-tagfile-fields-order intends to ensure that
+ this file isn't lacking (too far) behind dpkg over time. */
+
+static const char *iTFRewritePackageOrder[] = {
+ "Package",
+ "Package-Type",
+ "Architecture",
+ "Subarchitecture", // Used only by d-i
+ "Version",
+ "Revision", // Obsolete (warning in dpkg)
+ "Package-Revision", // Obsolete (warning in dpkg)
+ "Package_Revision", // Obsolete (warning in dpkg)
+ "Kernel-Version", // Used only by d-i
+ "Built-Using",
+ "Built-For-Profiles",
+ "Multi-Arch",
+ "Status",
+ "Priority",
+ "Class", // dpkg nickname for Priority
+ "Essential",
+ "Installer-Menu-Item", // Used only by d-i
+ "Section",
+ "Source",
+ "Origin",
+ "Maintainer",
+ "Original-Maintainer", // unknown in dpkg order
+ "Bugs",
+ "Config-Version", // Internal of dpkg
+ "Conffiles",
+ "Triggers-Awaited",
+ "Triggers-Pending",
+ "Installed-Size",
+ "Provides",
+ "Pre-Depends",
+ "Depends",
+ "Recommends",
+ "Recommended", // dpkg nickname for Recommends
+ "Suggests",
+ "Optional", // dpkg nickname for Suggests
+ "Conflicts",
+ "Breaks",
+ "Replaces",
+ "Enhances",
+ "Filename",
+ "MSDOS-Filename", // Obsolete (used by dselect)
+ "Size",
+ "MD5sum",
+ "SHA1",
+ "SHA256",
+ "SHA512",
+ "Homepage",
+ "Description",
+ "Tag",
+ "Task",
+ 0
+};
+static const char *iTFRewriteSourceOrder[] = {
+ "Package",
+ "Source", // dsc file, renamed to Package in Sources
+ "Format",
+ "Binary",
+ "Architecture",
+ "Version",
+ "Priority",
+ "Class", // dpkg nickname for Priority
+ "Section",
+ "Origin",
+ "Maintainer",
+ "Original-Maintainer", // unknown in dpkg order
+ "Uploaders",
+ "Dm-Upload-Allowed", // Obsolete (ignored by dak)
+ "Standards-Version",
+ "Build-Depends",
+ "Build-Depends-Arch",
+ "Build-Depends-Indep",
+ "Build-Conflicts",
+ "Build-Conflicts-Arch",
+ "Build-Conflicts-Indep",
+ "Testsuite",
+ "Homepage",
+ "Vcs-Browser",
+ "Vcs-Browse", // dak only (nickname?)
+ "Vcs-Arch",
+ "Vcs-Bzr",
+ "Vcs-Cvs",
+ "Vcs-Darcs",
+ "Vcs-Git",
+ "Vcs-Hg",
+ "Vcs-Mtn",
+ "Vcs-Svn",
+ "Directory",
+ "Package-List",
+ "Files",
+ "Checksums-Md5",
+ "Checksums-Sha1",
+ "Checksums-Sha256",
+ "Checksums-Sha512",
+ 0
+};
+
+/* Two levels of initialization are used because gcc will set the symbol
+ size of an array to the length of the array, causing dynamic relinking
+ errors. Doing this makes the symbol size constant */
+const char **TFRewritePackageOrder = iTFRewritePackageOrder;
+const char **TFRewriteSourceOrder = iTFRewriteSourceOrder;
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index b263baf66..5ff495fbd 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -47,6 +47,23 @@ public:
unsigned long long Size;
};
+class pkgTagSectionPrivate
+{
+public:
+ pkgTagSectionPrivate()
+ {
+ }
+ struct TagData {
+ unsigned int StartTag;
+ unsigned int EndTag;
+ unsigned int StartValue;
+ unsigned int NextInBucket;
+
+ TagData(unsigned int const StartTag) : StartTag(StartTag), EndTag(0), StartValue(0), NextInBucket(0) {}
+ };
+ std::vector<TagData> Tags;
+};
+
static unsigned long AlphaHash(const char *Text, size_t Length) /*{{{*/
{
/* This very simple hash function for the last 8 letters gives
@@ -166,8 +183,8 @@ bool pkgTagFile::Step(pkgTagSection &Tag)
break;
if (Resize() == false)
- return _error->Error(_("Unable to parse package file %s (1)"),
- d->Fd.Name().c_str());
+ return _error->Error(_("Unable to parse package file %s (%d)"),
+ d->Fd.Name().c_str(), 1);
} while (Tag.Scan(d->Start,d->End - d->Start, false) == false);
}
@@ -266,7 +283,7 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long long Offset)
return false;
if (Tag.Scan(d->Start, d->End - d->Start, false) == false)
- return _error->Error(_("Unable to parse package file %s (2)"),d->Fd.Name().c_str());
+ return _error->Error(_("Unable to parse package file %s (%d)"),d->Fd.Name().c_str(), 2);
return true;
}
@@ -274,21 +291,34 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long long Offset)
// pkgTagSection::pkgTagSection - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
+APT_IGNORE_DEPRECATED_PUSH
pkgTagSection::pkgTagSection()
: Section(0), d(NULL), Stop(0)
{
- memset(&LookupTable, 0, sizeof(LookupTable));
+ d = new pkgTagSectionPrivate();
+#if APT_PKG_ABI < 413
+ TagCount = 0;
+ memset(&Indexes, 0, sizeof(Indexes));
+#endif
+ memset(&AlphaIndexes, 0, sizeof(AlphaIndexes));
}
+APT_IGNORE_DEPRECATED_POP
/*}}}*/
// TagSection::Scan - Scan for the end of the header information /*{{{*/
+#if APT_PKG_ABI < 413
+bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
+{
+ return Scan(Start, MaxLength, true);
+}
+#endif
bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength, bool const Restart)
{
Section = Start;
const char *End = Start + MaxLength;
- if (Restart == false && Tags.empty() == false)
+ if (Restart == false && d->Tags.empty() == false)
{
- Stop = Section + Tags.back().StartTag;
+ Stop = Section + d->Tags.back().StartTag;
if (End <= Stop)
return false;
Stop = (const char *)memchr(Stop,'\n',End - Stop);
@@ -299,19 +329,23 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength, bool const R
else
{
Stop = Section;
- if (Tags.empty() == false)
+ if (d->Tags.empty() == false)
{
- memset(&LookupTable, 0, sizeof(LookupTable));
- Tags.clear();
+ memset(&AlphaIndexes, 0, sizeof(AlphaIndexes));
+ d->Tags.clear();
}
- Tags.reserve(0x100);
+ d->Tags.reserve(0x100);
}
- size_t TagCount = Tags.size();
+#if APT_PKG_ABI >= 413
+ unsigned int TagCount = d->Tags.size();
+#else
+ APT_IGNORE_DEPRECATED(TagCount = d->Tags.size();)
+#endif
if (Stop == 0)
return false;
- TagData lastTagData(0);
+ pkgTagSectionPrivate::TagData lastTagData(0);
lastTagData.EndTag = 0;
unsigned long lastTagHash = 0;
while (Stop < End)
@@ -329,14 +363,20 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength, bool const R
// store the last found tag
if (lastTagData.EndTag != 0)
{
- if (LookupTable[lastTagHash] != 0)
- lastTagData.NextInBucket = LookupTable[lastTagHash];
- LookupTable[lastTagHash] = TagCount;
- Tags.push_back(lastTagData);
+ if (AlphaIndexes[lastTagHash] != 0)
+ lastTagData.NextInBucket = AlphaIndexes[lastTagHash];
+ APT_IGNORE_DEPRECATED_PUSH
+ AlphaIndexes[lastTagHash] = TagCount;
+#if APT_PKG_ABI < 413
+ if (d->Tags.size() < sizeof(Indexes)/sizeof(Indexes[0]))
+ Indexes[d->Tags.size()] = lastTagData.StartTag;
+#endif
+ APT_IGNORE_DEPRECATED_POP
+ d->Tags.push_back(lastTagData);
}
- ++TagCount;
- lastTagData = TagData(Stop - Section);
+ APT_IGNORE_DEPRECATED(++TagCount;)
+ lastTagData = pkgTagSectionPrivate::TagData(Stop - Section);
// find the colon separating tag and value
char const * Colon = (char const *) memchr(Stop, ':', End - Stop);
if (Colon == NULL)
@@ -371,14 +411,20 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength, bool const R
{
if (lastTagData.EndTag != 0)
{
- if (LookupTable[lastTagHash] != 0)
- lastTagData.NextInBucket = LookupTable[lastTagHash];
- LookupTable[lastTagHash] = TagCount;
- Tags.push_back(lastTagData);
+ if (AlphaIndexes[lastTagHash] != 0)
+ lastTagData.NextInBucket = AlphaIndexes[lastTagHash];
+ APT_IGNORE_DEPRECATED(AlphaIndexes[lastTagHash] = TagCount;)
+#if APT_PKG_ABI < 413
+ APT_IGNORE_DEPRECATED(Indexes[d->Tags.size()] = lastTagData.StartTag;)
+#endif
+ d->Tags.push_back(lastTagData);
}
- TagData const td(Stop - Section);
- Tags.push_back(td);
+ pkgTagSectionPrivate::TagData const td(Stop - Section);
+#if APT_PKG_ABI < 413
+ APT_IGNORE_DEPRECATED(Indexes[d->Tags.size()] = td.StartTag;)
+#endif
+ d->Tags.push_back(td);
TrimRecord(false,End);
return true;
}
@@ -408,7 +454,11 @@ void pkgTagSection::Trim()
}
/*}}}*/
// TagSection::Exists - return True if a tag exists /*{{{*/
+#if APT_PKG_ABI >= 413
bool pkgTagSection::Exists(const char* const Tag) const
+#else
+bool pkgTagSection::Exists(const char* const Tag)
+#endif
{
unsigned int tmp;
return Find(Tag, tmp);
@@ -420,16 +470,16 @@ bool pkgTagSection::Exists(const char* const Tag) const
bool pkgTagSection::Find(const char *Tag,unsigned int &Pos) const
{
size_t const Length = strlen(Tag);
- unsigned int Bucket = LookupTable[AlphaHash(Tag, Length)];
+ unsigned int Bucket = AlphaIndexes[AlphaHash(Tag, Length)];
if (Bucket == 0)
return false;
- for (; Bucket != 0; Bucket = Tags[Bucket - 1].NextInBucket)
+ for (; Bucket != 0; Bucket = d->Tags[Bucket - 1].NextInBucket)
{
- if ((Tags[Bucket - 1].EndTag - Tags[Bucket - 1].StartTag) != Length)
+ if ((d->Tags[Bucket - 1].EndTag - d->Tags[Bucket - 1].StartTag) != Length)
continue;
- char const * const St = Section + Tags[Bucket - 1].StartTag;
+ char const * const St = Section + d->Tags[Bucket - 1].StartTag;
if (strncasecmp(Tag,St,Length) != 0)
continue;
@@ -447,9 +497,9 @@ bool pkgTagSection::Find(const char *Tag,const char *&Start,
if (Find(Tag, Pos) == false)
return false;
- Start = Section + Tags[Pos].StartValue;
+ Start = Section + d->Tags[Pos].StartValue;
// Strip off the gunk from the end
- End = Section + Tags[Pos + 1].StartTag;
+ End = Section + d->Tags[Pos + 1].StartTag;
if (unlikely(Start > End))
return _error->Error("Internal parsing error");
@@ -459,8 +509,6 @@ bool pkgTagSection::Find(const char *Tag,const char *&Start,
}
/*}}}*/
// TagSection::FindS - Find a string /*{{{*/
-// ---------------------------------------------------------------------
-/* */
string pkgTagSection::FindS(const char *Tag) const
{
const char *Start;
@@ -470,6 +518,24 @@ string pkgTagSection::FindS(const char *Tag) const
return string(Start,End);
}
/*}}}*/
+// TagSection::FindRawS - Find a string /*{{{*/
+string pkgTagSection::FindRawS(const char *Tag) const
+{
+ unsigned int Pos;
+ if (Find(Tag, Pos) == false)
+ return "";
+
+ char const *Start = (char const *) memchr(Section + d->Tags[Pos].EndTag, ':', d->Tags[Pos].StartValue - d->Tags[Pos].EndTag);
+ ++Start;
+ char const *End = Section + d->Tags[Pos + 1].StartTag;
+ if (unlikely(Start > End))
+ return "";
+
+ for (; isspace(End[-1]) != 0 && End > Start; --End);
+
+ return std::string(Start, End - Start);
+}
+ /*}}}*/
// TagSection::FindI - Find an integer /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -561,78 +627,153 @@ bool pkgTagSection::FindFlag(unsigned long &Flags, unsigned long Flag,
return true;
}
/*}}}*/
+void pkgTagSection::Get(const char *&Start,const char *&Stop,unsigned int I) const
+{
+ Start = Section + d->Tags[I].StartTag;
+ Stop = Section + d->Tags[I+1].StartTag;
+}
APT_PURE unsigned int pkgTagSection::Count() const { /*{{{*/
- if (Tags.empty() == true)
+ if (d->Tags.empty() == true)
return 0;
// the last element is just marking the end and isn't a real one
- return Tags.size() - 1;
+ return d->Tags.size() - 1;
+}
+ /*}}}*/
+// TagSection::Write - Ordered (re)writing of fields /*{{{*/
+pkgTagSection::Tag pkgTagSection::Tag::Remove(std::string const &Name)
+{
+ return Tag(REMOVE, Name, "");
+}
+pkgTagSection::Tag pkgTagSection::Tag::Rename(std::string const &OldName, std::string const &NewName)
+{
+ return Tag(RENAME, OldName, NewName);
+}
+pkgTagSection::Tag pkgTagSection::Tag::Rewrite(std::string const &Name, std::string const &Data)
+{
+ if (Data.empty() == true)
+ return Tag(REMOVE, Name, "");
+ else
+ return Tag(REWRITE, Name, Data);
+}
+static bool WriteTag(FileFd &File, std::string Tag, std::string const &Value)
+{
+ if (Value.empty() || isspace(Value[0]) != 0)
+ Tag.append(":");
+ else
+ Tag.append(": ");
+ Tag.append(Value);
+ Tag.append("\n");
+ return File.Write(Tag.c_str(), Tag.length());
+}
+static bool RewriteTags(FileFd &File, pkgTagSection const * const This, char const * const Tag,
+ std::vector<pkgTagSection::Tag>::const_iterator &R,
+ std::vector<pkgTagSection::Tag>::const_iterator const &REnd)
+{
+ size_t const TagLen = strlen(Tag);
+ for (; R != REnd; ++R)
+ {
+ std::string data;
+ if (R->Name.length() == TagLen && strncasecmp(R->Name.c_str(), Tag, R->Name.length()) == 0)
+ {
+ if (R->Action != pkgTagSection::Tag::REWRITE)
+ break;
+ data = R->Data;
+ }
+ else if(R->Action == pkgTagSection::Tag::RENAME && R->Data.length() == TagLen &&
+ strncasecmp(R->Data.c_str(), Tag, R->Data.length()) == 0)
+ data = This->FindRawS(R->Name.c_str());
+ else
+ continue;
+
+ return WriteTag(File, Tag, data);
+ }
+ return true;
+}
+bool pkgTagSection::Write(FileFd &File, char const * const * const Order, std::vector<Tag> const &Rewrite) const
+{
+ // first pass: Write everything we have an order for
+ if (Order != NULL)
+ {
+ for (unsigned int I = 0; Order[I] != 0; ++I)
+ {
+ std::vector<Tag>::const_iterator R = Rewrite.begin();
+ if (RewriteTags(File, this, Order[I], R, Rewrite.end()) == false)
+ return false;
+ if (R != Rewrite.end())
+ continue;
+
+ if (Exists(Order[I]) == false)
+ continue;
+
+ if (WriteTag(File, Order[I], FindRawS(Order[I])) == false)
+ return false;
+ }
+ }
+ // second pass: See if we have tags which aren't ordered
+ if (d->Tags.empty() == false)
+ {
+ for (std::vector<pkgTagSectionPrivate::TagData>::const_iterator T = d->Tags.begin(); T != d->Tags.end() - 1; ++T)
+ {
+ char const * const fieldname = Section + T->StartTag;
+ size_t fieldnamelen = T->EndTag - T->StartTag;
+ if (Order != NULL)
+ {
+ unsigned int I = 0;
+ for (; Order[I] != 0; ++I)
+ {
+ if (fieldnamelen == strlen(Order[I]) && strncasecmp(fieldname, Order[I], fieldnamelen) == 0)
+ break;
+ }
+ if (Order[I] != 0)
+ continue;
+ }
+
+ std::string const name(fieldname, fieldnamelen);
+ std::vector<Tag>::const_iterator R = Rewrite.begin();
+ if (RewriteTags(File, this, name.c_str(), R, Rewrite.end()) == false)
+ return false;
+ if (R != Rewrite.end())
+ continue;
+
+ if (WriteTag(File, name, FindRawS(name.c_str())) == false)
+ return false;
+ }
+ }
+ // last pass: see if there are any rewrites remaining we haven't done yet
+ for (std::vector<Tag>::const_iterator R = Rewrite.begin(); R != Rewrite.end(); ++R)
+ {
+ if (R->Action == Tag::REMOVE)
+ continue;
+ std::string const name = ((R->Action == Tag::RENAME) ? R->Data : R->Name);
+ if (Exists(name.c_str()))
+ continue;
+ if (Order != NULL)
+ {
+ unsigned int I = 0;
+ for (; Order[I] != 0; ++I)
+ {
+ if (strncasecmp(name.c_str(), Order[I], name.length()) == 0 && name.length() == strlen(Order[I]))
+ break;
+ }
+ if (Order[I] != 0)
+ continue;
+ }
+
+ if (WriteTag(File, name, ((R->Action == Tag::RENAME) ? FindRawS(R->Name.c_str()) : R->Data)) == false)
+ return false;
+ }
+ return true;
}
/*}}}*/
+
+#include "tagfile-order.c"
+
// TFRewrite - Rewrite a control record /*{{{*/
// ---------------------------------------------------------------------
/* This writes the control record to stdout rewriting it as necessary. The
override map item specificies the rewriting rules to follow. This also
takes the time to sort the feild list. */
-
-/* The order of this list is taken from dpkg source lib/parse.c the fieldinfos
- array. */
-static const char *iTFRewritePackageOrder[] = {
- "Package",
- "Essential",
- "Status",
- "Priority",
- "Section",
- "Installed-Size",
- "Maintainer",
- "Original-Maintainer",
- "Architecture",
- "Source",
- "Version",
- "Revision", // Obsolete
- "Config-Version", // Obsolete
- "Replaces",
- "Provides",
- "Depends",
- "Pre-Depends",
- "Recommends",
- "Suggests",
- "Conflicts",
- "Breaks",
- "Conffiles",
- "Filename",
- "Size",
- "MD5sum",
- "SHA1",
- "SHA256",
- "SHA512",
- "MSDOS-Filename", // Obsolete
- "Description",
- 0};
-static const char *iTFRewriteSourceOrder[] = {"Package",
- "Source",
- "Binary",
- "Version",
- "Priority",
- "Section",
- "Maintainer",
- "Original-Maintainer",
- "Build-Depends",
- "Build-Depends-Indep",
- "Build-Conflicts",
- "Build-Conflicts-Indep",
- "Architecture",
- "Standards-Version",
- "Format",
- "Directory",
- "Files",
- 0};
-
-/* Two levels of initialization are used because gcc will set the symbol
- size of an array to the length of the array, causing dynamic relinking
- errors. Doing this makes the symbol size constant */
-const char **TFRewritePackageOrder = iTFRewritePackageOrder;
-const char **TFRewriteSourceOrder = iTFRewriteSourceOrder;
-
+APT_IGNORE_DEPRECATED_PUSH
bool TFRewrite(FILE *Output,pkgTagSection const &Tags,const char *Order[],
TFRewriteData *Rewrite)
{
@@ -756,6 +897,7 @@ bool TFRewrite(FILE *Output,pkgTagSection const &Tags,const char *Order[],
return true;
}
+APT_IGNORE_DEPRECATED_POP
/*}}}*/
-pkgTagSection::~pkgTagSection() {}
+pkgTagSection::~pkgTagSection() { delete d; }
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 4cd99b2fc..24eda02f7 100644
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -1,6 +1,5 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: tagfile.h,v 1.20 2003/05/19 17:13:57 doogie Exp $
/* ######################################################################
Fast scanner for RFC-822 type header information
@@ -33,35 +32,34 @@
#endif
class FileFd;
+class pkgTagSectionPrivate;
class pkgTagSection
{
const char *Section;
- struct TagData {
- unsigned int StartTag;
- unsigned int EndTag;
- unsigned int StartValue;
- unsigned int NextInBucket;
-
- TagData(unsigned int const StartTag) : StartTag(StartTag), EndTag(0), StartValue(0), NextInBucket(0) {}
- };
- std::vector<TagData> Tags;
- unsigned int LookupTable[0x100];
+ // We have a limit of 256 tags per section with the old abi
+#if APT_PKG_ABI < 413
+ APT_DEPRECATED unsigned int Indexes[256];
+#endif
+ unsigned int AlphaIndexes[0x100];
+#if APT_PKG_ABI < 413
+ APT_DEPRECATED unsigned int TagCount;
+#endif
- // dpointer placeholder (for later in case we need it)
- void *d;
+ pkgTagSectionPrivate *d;
protected:
const char *Stop;
public:
-
+
inline bool operator ==(const pkgTagSection &rhs) {return Section == rhs.Section;};
inline bool operator !=(const pkgTagSection &rhs) {return Section != rhs.Section;};
-
+
bool Find(const char *Tag,const char *&Start, const char *&End) const;
bool Find(const char *Tag,unsigned int &Pos) const;
std::string FindS(const char *Tag) const;
+ std::string FindRawS(const char *Tag) const;
signed int FindI(const char *Tag,signed long Default = 0) const;
bool FindB(const char *Tag, bool const &Default = false) const;
unsigned long long FindULL(const char *Tag, unsigned long long const &Default = 0) const;
@@ -86,7 +84,13 @@ class pkgTagSection
* @return \b true if section end was found, \b false otherwise.
* Beware that internal state will be inconsistent if \b false is returned!
*/
+#if APT_PKG_ABI >= 413
APT_MUSTCHECK bool Scan(const char *Start, unsigned long MaxLength, bool const Restart = true);
+#else
+ APT_MUSTCHECK bool Scan(const char *Start, unsigned long MaxLength, bool const Restart);
+ APT_MUSTCHECK bool Scan(const char *Start, unsigned long MaxLength);
+#endif
+
inline unsigned long size() const {return Stop - Section;};
void Trim();
virtual void TrimRecord(bool BeforeRecord, const char* &End);
@@ -97,19 +101,45 @@ class pkgTagSection
* times, but only the last occurrence is available via Find methods.
*/
unsigned int Count() const;
+#if APT_PKG_ABI >= 413
bool Exists(const char* const Tag) const;
+#else
+ bool Exists(const char* const Tag);
+#endif
- inline void Get(const char *&Start,const char *&Stop,unsigned int I) const
- {Start = Section + Tags[I].StartTag; Stop = Section + Tags[I+1].StartTag;}
+ void Get(const char *&Start,const char *&Stop,unsigned int I) const;
inline void GetSection(const char *&Start,const char *&Stop) const
{
Start = Section;
Stop = this->Stop;
};
-
+
pkgTagSection();
virtual ~pkgTagSection();
+
+ struct Tag
+ {
+ enum ActionType { REMOVE, RENAME, REWRITE } Action;
+ std::string Name;
+ std::string Data;
+
+ static Tag Remove(std::string const &Name);
+ static Tag Rename(std::string const &OldName, std::string const &NewName);
+ static Tag Rewrite(std::string const &Name, std::string const &Data);
+ private:
+ Tag(ActionType const Action, std::string const &Name, std::string const &Data) :
+ Action(Action), Name(Name), Data(Data) {}
+ };
+
+ /** Write this section (with optional rewrites) to a file
+ *
+ * @param File to write the section to
+ * @param Order in which tags should appear in the file
+ * @param Rewrite is a set of tags to be renamed, rewitten and/or removed
+ * @return \b true if successful, otherwise \b false
+ */
+ bool Write(FileFd &File, char const * const * const Order = NULL, std::vector<Tag> const &Rewrite = std::vector<Tag>()) const;
};
class pkgTagFilePrivate;
@@ -133,20 +163,19 @@ class pkgTagFile
virtual ~pkgTagFile();
};
-/* This is the list of things to rewrite. The rewriter
- goes through and changes or adds each of these headers
- to suit. A zero forces the header to be erased, an empty string
- causes the old value to be used. (rewrite rule ignored) */
-struct TFRewriteData
+extern const char **TFRewritePackageOrder;
+extern const char **TFRewriteSourceOrder;
+
+// Use pkgTagSection::Tag and pkgTagSection::Write() instead
+APT_IGNORE_DEPRECATED_PUSH
+struct APT_DEPRECATED TFRewriteData
{
const char *Tag;
const char *Rewrite;
const char *NewTag;
};
-extern const char **TFRewritePackageOrder;
-extern const char **TFRewriteSourceOrder;
-
-bool TFRewrite(FILE *Output,pkgTagSection const &Tags,const char *Order[],
+APT_DEPRECATED bool TFRewrite(FILE *Output,pkgTagSection const &Tags,const char *Order[],
TFRewriteData *Rewrite);
+APT_IGNORE_DEPRECATED_POP
#endif
diff --git a/apt-pkg/upgrade.cc b/apt-pkg/upgrade.cc
index ca670bdf5..6c8721da8 100644
--- a/apt-pkg/upgrade.cc
+++ b/apt-pkg/upgrade.cc
@@ -24,7 +24,7 @@
The problem resolver is used to resolve the problems.
*/
-bool pkgDistUpgrade(pkgDepCache &Cache, OpProgress * const Progress)
+static bool pkgDistUpgrade(pkgDepCache &Cache, OpProgress * const Progress)
{
std::string const solver = _config->Find("APT::Solver", "internal");
if (solver != "internal")
@@ -120,6 +120,10 @@ bool pkgDistUpgrade(pkgDepCache &Cache, OpProgress * const Progress)
Progress->Done();
return success;
}
+bool pkgDistUpgrade(pkgDepCache &Cache)
+{
+ return pkgDistUpgrade(Cache, NULL);
+}
/*}}}*/
// AllUpgradeNoNewPackages - Upgrade but no removals or new pkgs /*{{{*/
static bool pkgAllUpgradeNoNewPackages(pkgDepCache &Cache, OpProgress * const Progress)
@@ -229,10 +233,14 @@ static bool pkgAllUpgradeWithNewPackages(pkgDepCache &Cache, OpProgress * const
/* Right now the system must be consistent before this can be called.
It also will not change packages marked for install, it only tries
to install packages not marked for install */
-bool pkgAllUpgrade(pkgDepCache &Cache, OpProgress * const Progress)
+static bool pkgAllUpgrade(pkgDepCache &Cache, OpProgress * const Progress)
{
return pkgAllUpgradeNoNewPackages(Cache, Progress);
}
+bool pkgAllUpgrade(pkgDepCache &Cache)
+{
+ return pkgAllUpgrade(Cache, NULL);
+}
/*}}}*/
// MinimizeUpgrade - Minimizes the set of packages to be upgraded /*{{{*/
// ---------------------------------------------------------------------
@@ -280,13 +288,15 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache)
}
/*}}}*/
// APT::Upgrade::Upgrade - Upgrade using a specific strategy /*{{{*/
-bool APT::Upgrade::Upgrade(pkgDepCache &Cache, int mode, OpProgress * const Progress)
+#if APT_PKG_ABI < 413
+bool APT::Upgrade::Upgrade(pkgDepCache &Cache, int mode)
{
-#if __GNUC__ >= 4
- // the deprecated methods will become our privates, so that is fine
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ return Upgrade(Cache, mode, NULL);
+}
#endif
+bool APT::Upgrade::Upgrade(pkgDepCache &Cache, int mode, OpProgress * const Progress)
+{
+APT_IGNORE_DEPRECATED_PUSH
if (mode == ALLOW_EVERYTHING)
return pkgDistUpgrade(Cache, Progress);
else if ((mode & ~FORBID_REMOVE_PACKAGES) == 0)
@@ -295,9 +305,7 @@ bool APT::Upgrade::Upgrade(pkgDepCache &Cache, int mode, OpProgress * const Prog
return pkgAllUpgradeNoNewPackages(Cache, Progress);
else
_error->Error("pkgAllUpgrade called with unsupported mode %i", mode);
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
return false;
}
/*}}}*/
diff --git a/apt-pkg/upgrade.h b/apt-pkg/upgrade.h
index a3f693d86..18b6aac7b 100644
--- a/apt-pkg/upgrade.h
+++ b/apt-pkg/upgrade.h
@@ -20,17 +20,22 @@ namespace APT {
namespace Upgrade {
// FIXME: make this "enum class UpgradeMode {" once we enable c++11
enum UpgradeMode {
- ALLOW_EVERYTHING = 0,
FORBID_REMOVE_PACKAGES = 1,
- FORBID_INSTALL_NEW_PACKAGES = 2
+ FORBID_INSTALL_NEW_PACKAGES = 2,
+ ALLOW_EVERYTHING = 0
};
+#if APT_PKG_ABI >= 413
bool Upgrade(pkgDepCache &Cache, int UpgradeMode, OpProgress * const Progress = NULL);
+#else
+ bool Upgrade(pkgDepCache &Cache, int UpgradeMode);
+ bool Upgrade(pkgDepCache &Cache, int UpgradeMode, OpProgress * const Progress);
+#endif
}
}
// please use APT::Upgrade::Upgrade() instead
-APT_DEPRECATED bool pkgDistUpgrade(pkgDepCache &Cache, OpProgress * const Progress = NULL);
-APT_DEPRECATED bool pkgAllUpgrade(pkgDepCache &Cache, OpProgress * const Progress = NULL);
+APT_DEPRECATED bool pkgDistUpgrade(pkgDepCache &Cache);
+APT_DEPRECATED bool pkgAllUpgrade(pkgDepCache &Cache);
bool pkgMinimizeUpgrade(pkgDepCache &Cache);
#endif
diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc
index fb33ff17d..db5b87fc0 100644
--- a/apt-pkg/vendorlist.cc
+++ b/apt-pkg/vendorlist.cc
@@ -11,10 +11,8 @@
#include <apti18n.h>
-#if __GNUC__ >= 4
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+// The whole vendor system is deprecated
+APT_IGNORE_DEPRECATED_PUSH
#include <apt-pkg/vendor.h>
#include <apt-pkg/vendorlist.h>
@@ -163,6 +161,4 @@ const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput) /*
}
/*}}}*/
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
diff --git a/apt-pkg/version.cc b/apt-pkg/version.cc
index 29bee46da..f32d39a69 100644
--- a/apt-pkg/version.cc
+++ b/apt-pkg/version.cc
@@ -40,3 +40,6 @@ pkgVersioningSystem *pkgVersioningSystem::GetVS(const char *Label)
return 0;
}
/*}}}*/
+
+
+pkgVersioningSystem::~pkgVersioningSystem() {}
diff --git a/apt-pkg/version.h b/apt-pkg/version.h
index d98809f7e..5110ecaa7 100644
--- a/apt-pkg/version.h
+++ b/apt-pkg/version.h
@@ -55,7 +55,7 @@ class pkgVersioningSystem
APT_MKSTRCMP(CmpReleaseVer,DoCmpReleaseVer);
pkgVersioningSystem();
- virtual ~pkgVersioningSystem() {};
+ virtual ~pkgVersioningSystem();
};
#endif
diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index 284098bdf..86c1b7d4a 100644
--- a/apt-pkg/versionmatch.cc
+++ b/apt-pkg/versionmatch.cc
@@ -137,7 +137,10 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
// ---------------------------------------------------------------------
/* */
bool pkgVersionMatch::MatchVer(const char *A,string B,bool Prefix)
-{
+{
+ if (A == NULL)
+ return false;
+
const char *Ab = A;
const char *Ae = Ab + strlen(A);
@@ -178,13 +181,16 @@ pkgCache::VerIterator pkgVersionMatch::Find(pkgCache::PkgIterator Pkg)
// This will be Ended by now.
return Ver;
}
+ /*}}}*/
#ifndef FNM_CASEFOLD
#define FNM_CASEFOLD 0
#endif
-bool pkgVersionMatch::ExpressionMatches(const char *pattern, const char *string)
+bool pkgVersionMatch::ExpressionMatches(const char *pattern, const char *string)/*{{{*/
{
+ if (pattern == NULL || string == NULL)
+ return false;
if (pattern[0] == '/') {
size_t length = strlen(pattern);
if (pattern[length - 1] == '/') {
@@ -230,38 +236,30 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File)
return false;
if (RelVerStr.empty() == false)
- if (File->Version == 0 ||
- (MatchVer(File.Version(),RelVerStr,RelVerPrefixMatch) == false &&
- ExpressionMatches(RelVerStr, File.Version()) == false))
+ if (MatchVer(File.Version(),RelVerStr,RelVerPrefixMatch) == false &&
+ ExpressionMatches(RelVerStr, File.Version()) == false)
return false;
if (RelOrigin.empty() == false)
- if (File->Origin == 0 || !ExpressionMatches(RelOrigin,File.Origin()))
+ if (!ExpressionMatches(RelOrigin,File.Origin()))
return false;
if (RelArchive.empty() == false)
- if (File->Archive == 0 ||
- !ExpressionMatches(RelArchive,File.Archive()))
+ if (!ExpressionMatches(RelArchive,File.Archive()))
return false;
if (RelCodename.empty() == false)
- if (File->Codename == 0 ||
- !ExpressionMatches(RelCodename,File.Codename()))
+ if (!ExpressionMatches(RelCodename,File.Codename()))
return false;
if (RelRelease.empty() == false)
- if ((File->Archive == 0 ||
- !ExpressionMatches(RelRelease,File.Archive())) &&
- (File->Codename == 0 ||
- !ExpressionMatches(RelRelease,File.Codename())))
+ if (!ExpressionMatches(RelRelease,File.Archive()) &&
+ !ExpressionMatches(RelRelease,File.Codename()))
return false;
if (RelLabel.empty() == false)
- if (File->Label == 0 ||
- !ExpressionMatches(RelLabel,File.Label()))
+ if (!ExpressionMatches(RelLabel,File.Label()))
return false;
if (RelComponent.empty() == false)
- if (File->Component == 0 ||
- !ExpressionMatches(RelComponent,File.Component()))
+ if (!ExpressionMatches(RelComponent,File.Component()))
return false;
if (RelArchitecture.empty() == false)
- if (File->Architecture == 0 ||
- !ExpressionMatches(RelArchitecture,File.Architecture()))
+ if (!ExpressionMatches(RelArchitecture,File.Architecture()))
return false;
return true;
}
@@ -269,11 +267,14 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File)
if (Type == Origin)
{
if (OrSite.empty() == false) {
- if (File->Site == 0)
+ if (File.Site() == NULL)
return false;
} else // so we are talking about file:// or status file
- if (strcmp(File.Site(),"") == 0 && File->Archive != 0 && strcmp(File.Archive(),"now") == 0) // skip the status file
+ {
+ pkgCache::RlsFileIterator const RlsFile = File.ReleaseFile();
+ if (strcmp(File.Site(),"") == 0 && RlsFile->Archive != 0 && strcmp(RlsFile.Archive(),"now") == 0) // skip the status file
return false;
+ }
return (ExpressionMatches(OrSite, File.Site())); /* both strings match */
}
diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h
index 4c8f704c8..bb950b9c7 100644
--- a/apt-pkg/versionmatch.h
+++ b/apt-pkg/versionmatch.h
@@ -70,8 +70,8 @@ class pkgVersionMatch
enum MatchType {None = 0,Version,Release,Origin} Type;
bool MatchVer(const char *A,std::string B,bool Prefix) APT_PURE;
- bool ExpressionMatches(const char *pattern, const char *string);
- bool ExpressionMatches(const std::string& pattern, const char *string);
+ static bool ExpressionMatches(const char *pattern, const char *string);
+ static bool ExpressionMatches(const std::string& pattern, const char *string);
bool FileMatch(pkgCache::PkgFileIterator File);
pkgCache::VerIterator Find(pkgCache::PkgIterator Pkg);
diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc
index 14a53eacb..f6c3d1204 100644
--- a/apt-private/acqprogress.cc
+++ b/apt-private/acqprogress.cc
@@ -1,10 +1,9 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: acqprogress.cc,v 1.24 2003/04/27 01:56:48 doogie Exp $
/* ######################################################################
- Acquire Progress - Command line progress meter
-
+ Acquire Progress - Command line progress meter
+
##################################################################### */
/*}}}*/
// Include files /*{{{*/
@@ -23,20 +22,18 @@
#include <stdio.h>
#include <signal.h>
#include <iostream>
+#include <sstream>
#include <unistd.h>
#include <apti18n.h>
/*}}}*/
-using namespace std;
-
// AcqTextStatus::AcqTextStatus - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet) :
- pkgAcquireStatus(), ScreenWidth(ScreenWidth), ID(0), Quiet(Quiet)
+AcqTextStatus::AcqTextStatus(std::ostream &out, unsigned int &ScreenWidth,unsigned int const Quiet) :
+ pkgAcquireStatus(), out(out), ScreenWidth(ScreenWidth), LastLineLength(0), ID(0), Quiet(Quiet)
{
- BlankLine[0] = 0;
// testcases use it to disable pulses without disabling other user messages
if (Quiet == 0 && _config->FindB("quiet::NoUpdate", false) == true)
this->Quiet = 1;
@@ -48,10 +45,20 @@ AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet)
void AcqTextStatus::Start()
{
pkgAcquireStatus::Start();
- BlankLine[0] = 0;
+ LastLineLength = 0;
ID = 1;
}
/*}}}*/
+void AcqTextStatus::AssignItemID(pkgAcquire::ItemDesc &Itm) /*{{{*/
+{
+ /* In theory calling it from Fetch() would be enough, but to be
+ safe we call it from IMSHit and Fail as well.
+ Also, an Item can pass through multiple stages, so ensure
+ that it keeps the same number */
+ if (Itm.Owner->ID == 0)
+ Itm.Owner->ID = ID++;
+}
+ /*}}}*/
// AcqTextStatus::IMSHit - Called when an item got a HIT response /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -60,11 +67,12 @@ void AcqTextStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
if (Quiet > 1)
return;
- if (Quiet <= 0)
- cout << '\r' << BlankLine << '\r';
+ AssignItemID(Itm);
+ clearLastLine();
- cout << _("Hit ") << Itm.Description;
- cout << endl;
+ // TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update'
+ ioprintf(out, _("Hit:%lu %s"), Itm.Owner->ID, Itm.Description.c_str());
+ out << std::endl;
Update = true;
}
/*}}}*/
@@ -76,27 +84,28 @@ void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
Update = true;
if (Itm.Owner->Complete == true)
return;
-
- Itm.Owner->ID = ID++;
+ AssignItemID(Itm);
if (Quiet > 1)
return;
- if (Quiet <= 0)
- cout << '\r' << BlankLine << '\r';
+ clearLastLine();
- cout << _("Get:") << Itm.Owner->ID << ' ' << Itm.Description;
+ // TRANSLATOR: Very short word to be displayed for files processed in 'apt-get update'
+ // Potentially replaced later by "Hit:", "Ign:" or "Err:" if something (bad) happens
+ ioprintf(out, _("Get:%lu %s"), Itm.Owner->ID, Itm.Description.c_str());
if (Itm.Owner->FileSize != 0)
- cout << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
- cout << endl;
+ out << " [" << SizeToStr(Itm.Owner->FileSize) << "B]";
+ out << std::endl;
}
/*}}}*/
// AcqTextStatus::Done - Completed a download /*{{{*/
// ---------------------------------------------------------------------
/* We don't display anything... */
-void AcqTextStatus::Done(pkgAcquire::ItemDesc &/*Itm*/)
+void AcqTextStatus::Done(pkgAcquire::ItemDesc &Itm)
{
Update = true;
+ AssignItemID(Itm);
}
/*}}}*/
// AcqTextStatus::Fail - Called when an item fails to download /*{{{*/
@@ -107,24 +116,25 @@ void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm)
if (Quiet > 1)
return;
- // Ignore certain kinds of transient failures (bad code)
- if (Itm.Owner->Status == pkgAcquire::Item::StatIdle)
- return;
-
- if (Quiet <= 0)
- cout << '\r' << BlankLine << '\r';
+ AssignItemID(Itm);
+ clearLastLine();
- if (Itm.Owner->Status == pkgAcquire::Item::StatDone)
+ if (Itm.Owner->Status == pkgAcquire::Item::StatDone || Itm.Owner->Status == pkgAcquire::Item::StatIdle)
{
- cout << _("Ign ") << Itm.Description << endl;
+ // TRANSLATOR: Very short word to be displayed for files in 'apt-get update'
+ // which failed to download, but the error is ignored (compare "Err:")
+ ioprintf(out, _("Ign:%lu %s"), Itm.Owner->ID, Itm.Description.c_str());
if (Itm.Owner->ErrorText.empty() == false &&
_config->FindB("Acquire::Progress::Ignore::ShowErrorText", false) == true)
- cout << " " << Itm.Owner->ErrorText << endl;
+ out << std::endl << " " << Itm.Owner->ErrorText;
+ out << std::endl;
}
else
{
- cout << _("Err ") << Itm.Description << endl;
- cout << " " << Itm.Owner->ErrorText << endl;
+ // TRANSLATOR: Very short word to be displayed for files in 'apt-get update'
+ // which failed to download and the error is critical (compare "Ign:")
+ ioprintf(out, _("Err:%lu %s"), Itm.Owner->ID, Itm.Description.c_str());
+ out << std::endl << " " << Itm.Owner->ErrorText << std::endl;
}
Update = true;
@@ -140,14 +150,13 @@ void AcqTextStatus::Stop()
if (Quiet > 1)
return;
- if (Quiet <= 0)
- cout << '\r' << BlankLine << '\r' << flush;
+ clearLastLine();
if (_config->FindB("quiet::NoStatistic", false) == true)
return;
if (FetchedBytes != 0 && _error->PendingError() == false)
- ioprintf(cout,_("Fetched %sB in %s (%sB/s)\n"),
+ ioprintf(out,_("Fetched %sB in %s (%sB/s)\n"),
SizeToStr(FetchedBytes).c_str(),
TimeToStr(ElapsedTime).c_str(),
SizeToStr(CurrentCPS).c_str());
@@ -156,7 +165,7 @@ void AcqTextStatus::Stop()
// AcqTextStatus::Pulse - Regular event pulse /*{{{*/
// ---------------------------------------------------------------------
/* This draws the current progress. Each line has an overall percent
- meter and a per active item status meter along with an overall
+ meter and a per active item status meter along with an overall
bandwidth and ETA indicator. */
bool AcqTextStatus::Pulse(pkgAcquire *Owner)
{
@@ -167,77 +176,66 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
enum {Long = 0,Medium,Short} Mode = Medium;
- char Buffer[sizeof(BlankLine)];
- char *End = Buffer + sizeof(Buffer);
- char *S = Buffer;
- if (ScreenWidth >= sizeof(Buffer))
- ScreenWidth = sizeof(Buffer)-1;
-
- // Put in the percent done
- sprintf(S,"%.0f%%", Percent);
-
- bool Shown = false;
- for (pkgAcquire::Worker *I = Owner->WorkersBegin(); I != 0;
- I = Owner->WorkerStep(I))
+ std::string Line;
{
- S += strlen(S);
-
- // There is no item running
- if (I->CurrentItem == 0)
+ std::stringstream S;
+ for (pkgAcquire::Worker *I = Owner->WorkersBegin(); I != 0;
+ I = Owner->WorkerStep(I))
{
- if (I->Status.empty() == false)
+ // There is no item running
+ if (I->CurrentItem == 0)
{
- snprintf(S,End-S," [%s]",I->Status.c_str());
- Shown = true;
- }
-
- continue;
- }
+ if (I->Status.empty() == false)
+ S << " [" << I->Status << "]";
- Shown = true;
+ continue;
+ }
- // Add in the short description
- if (I->CurrentItem->Owner->ID != 0)
- snprintf(S,End-S," [%lu %s",I->CurrentItem->Owner->ID,
- I->CurrentItem->ShortDesc.c_str());
- else
- snprintf(S,End-S," [%s",I->CurrentItem->ShortDesc.c_str());
- S += strlen(S);
+ // Add in the short description
+ S << " [";
+ if (I->CurrentItem->Owner->ID != 0)
+ S << I->CurrentItem->Owner->ID << " ";
+ S << I->CurrentItem->ShortDesc;
- // Show the short mode string
- if (I->CurrentItem->Owner->ActiveSubprocess.empty() == false)
- {
- snprintf(S,End-S, " %s", I->CurrentItem->Owner->ActiveSubprocess.c_str());
- S += strlen(S);
- }
+ // Show the short mode string
+ if (I->CurrentItem->Owner->ActiveSubprocess.empty() == false)
+ S << " " << I->CurrentItem->Owner->ActiveSubprocess;
- // Add the current progress
- if (Mode == Long)
- snprintf(S,End-S," %llu",I->CurrentSize);
- else
- {
- if (Mode == Medium || I->TotalSize == 0)
- snprintf(S,End-S," %sB",SizeToStr(I->CurrentSize).c_str());
- }
- S += strlen(S);
-
- // Add the total size and percent
- if (I->TotalSize > 0 && I->CurrentItem->Owner->Complete == false)
- {
- if (Mode == Short)
- snprintf(S,End-S," %.0f%%",
- (I->CurrentSize*100.0)/I->TotalSize);
+ // Add the current progress
+ if (Mode == Long)
+ S << " " << I->CurrentSize;
else
- snprintf(S,End-S,"/%sB %.0f%%",SizeToStr(I->TotalSize).c_str(),
+ {
+ if (Mode == Medium || I->TotalSize == 0)
+ S << " " << SizeToStr(I->CurrentSize) << "B";
+ }
+
+ // Add the total size and percent
+ if (I->TotalSize > 0 && I->CurrentItem->Owner->Complete == false)
+ {
+ if (Mode == Short)
+ ioprintf(S, " %.0f%%", (I->CurrentSize*100.0)/I->TotalSize);
+ else
+ ioprintf(S, "/%sB %.0f%%", SizeToStr(I->TotalSize).c_str(),
(I->CurrentSize*100.0)/I->TotalSize);
+ }
+ S << "]";
}
- S += strlen(S);
- snprintf(S,End-S,"]");
- }
- // Show something..
- if (Shown == false)
- snprintf(S,End-S,_(" [Working]"));
+ // Show at least something
+ Line = S.str();
+ S.clear();
+ if (Line.empty() == true)
+ Line = _(" [Working]");
+ }
+ // Put in the percent done
+ {
+ std::stringstream S;
+ ioprintf(S, "%.0f%%", Percent);
+ S << Line;
+ Line = S.str();
+ S.clear();
+ }
/* Put in the ETA and cps meter, block off signals to prevent strangeness
during resizing */
@@ -248,34 +246,33 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
if (CurrentCPS != 0)
{
- char Tmp[300];
unsigned long long ETA = (TotalBytes - CurrentBytes)/CurrentCPS;
- sprintf(Tmp," %sB/s %s",SizeToStr(CurrentCPS).c_str(),TimeToStr(ETA).c_str());
- unsigned int Len = strlen(Buffer);
- unsigned int LenT = strlen(Tmp);
- if (Len + LenT < ScreenWidth)
+ std::string Tmp = " " + SizeToStr(CurrentCPS) + "B/s " + TimeToStr(ETA);
+ size_t alignment = Line.length() + Tmp.length();
+ if (alignment < ScreenWidth)
{
- memset(Buffer + Len,' ',ScreenWidth - Len);
- strcpy(Buffer + ScreenWidth - LenT,Tmp);
+ alignment = ScreenWidth - alignment;
+ for (size_t i = 0; i < alignment; ++i)
+ Line.append(" ");
+ Line.append(Tmp);
}
}
- Buffer[ScreenWidth] = 0;
- BlankLine[ScreenWidth] = 0;
+ if (Line.length() > ScreenWidth)
+ Line.erase(ScreenWidth);
sigprocmask(SIG_SETMASK,&OldSigs,0);
// Draw the current status
if (_config->FindB("Apt::Color", false) == true)
- cout << _config->Find("APT::Color::Yellow");
- if (strlen(Buffer) == strlen(BlankLine))
- cout << '\r' << Buffer << flush;
+ out << _config->Find("APT::Color::Yellow");
+ if (LastLineLength > Line.length())
+ clearLastLine();
else
- cout << '\r' << BlankLine << '\r' << Buffer << flush;
+ out << '\r';
+ out << Line << std::flush;
if (_config->FindB("Apt::Color", false) == true)
- cout << _config->Find("APT::Color::Neutral") << flush;
-
- memset(BlankLine,' ',strlen(Buffer));
- BlankLine[strlen(Buffer)] = 0;
+ out << _config->Find("APT::Color::Neutral") << std::flush;
+ LastLineLength = Line.length();
Update = false;
return true;
@@ -284,7 +281,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
// AcqTextStatus::MediaChange - Media need to be swapped /*{{{*/
// ---------------------------------------------------------------------
/* Prompt for a media swap */
-bool AcqTextStatus::MediaChange(string Media,string Drive)
+bool AcqTextStatus::MediaChange(std::string Media, std::string Drive)
{
// If we do not output on a terminal and one of the options to avoid user
// interaction is given, we assume that no user is present who could react
@@ -296,9 +293,8 @@ bool AcqTextStatus::MediaChange(string Media,string Drive)
return false;
- if (Quiet <= 0)
- cout << '\r' << BlankLine << '\r';
- ioprintf(cout,_("Media change: please insert the disc labeled\n"
+ clearLastLine();
+ ioprintf(out,_("Media change: please insert the disc labeled\n"
" '%s'\n"
"in the drive '%s' and press enter\n"),
Media.c_str(),Drive.c_str());
@@ -317,3 +313,17 @@ bool AcqTextStatus::MediaChange(string Media,string Drive)
return bStatus;
}
/*}}}*/
+void AcqTextStatus::clearLastLine() { /*{{{*/
+ if (Quiet > 0 || LastLineLength == 0)
+ return;
+
+ // do not try to clear more than the (now smaller) screen
+ if (LastLineLength > ScreenWidth)
+ LastLineLength = ScreenWidth;
+
+ out << '\r';
+ for (size_t i = 0; i < LastLineLength; ++i)
+ out << ' ';
+ out << '\r' << std::flush;
+}
+ /*}}}*/
diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h
index 71a10d78a..cbb06fbec 100644
--- a/apt-private/acqprogress.h
+++ b/apt-private/acqprogress.h
@@ -13,14 +13,19 @@
#include <apt-pkg/macros.h>
#include <string>
+#include <iostream>
class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus
{
+ std::ostream &out;
unsigned int &ScreenWidth;
- char BlankLine[1024];
+ size_t LastLineLength;
unsigned long ID;
unsigned long Quiet;
+ APT_HIDDEN void clearLastLine();
+ APT_HIDDEN void AssignItemID(pkgAcquire::ItemDesc &Itm);
+
public:
virtual bool MediaChange(std::string Media,std::string Drive);
@@ -33,7 +38,7 @@ class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus
bool Pulse(pkgAcquire *Owner);
- AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet);
+ AcqTextStatus(std::ostream &out, unsigned int &ScreenWidth,unsigned int const Quiet);
};
#endif
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index aa01be757..11e88b1e7 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -2,12 +2,17 @@
#include <config.h>
#include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/init.h>
+#include <apt-pkg/error.h>
#include <apt-private/private-cmndline.h>
#include <vector>
#include <stdarg.h>
#include <string.h>
+#include <stdlib.h>
#include <apti18n.h>
/*}}}*/
@@ -158,6 +163,11 @@ static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const
// once sbuild is fixed, this option can be removed
addArg('f', "fix-broken", "APT::Get::Fix-Broken", 0);
}
+ else if (CmdMatches("files"))
+ {
+ addArg(0,"format","APT::Get::Files::Format", CommandLine::HasArg);
+ addArg(0,"release-info","APT::Get::Files::ReleaseInfo", 0);
+ }
else if (CmdMatches("clean", "autoclean", "check", "download", "changelog") ||
CmdMatches("markauto", "unmarkauto")) // deprecated commands
;
@@ -165,7 +175,7 @@ static bool addArgumentsAPTGet(std::vector<CommandLine::Args> &Args, char const
addArg(0, "color", "APT::Moo::Color", 0);
if (CmdMatches("install", "remove", "purge", "upgrade", "dist-upgrade",
- "deselect-upgrade", "autoremove", "clean", "autoclean", "check",
+ "dselect-upgrade", "autoremove", "clean", "autoclean", "check",
"build-dep", "full-upgrade", "source"))
{
addArg('s', "simulate", "APT::Get::Simulate", 0);
@@ -287,3 +297,31 @@ std::vector<CommandLine::Args> getCommandArgs(char const * const Program, char c
/*}}}*/
#undef CmdMatches
#undef addArg
+void ParseCommandLine(CommandLine &CmdL, CommandLine::Dispatch * const Cmds, CommandLine::Args * const Args,/*{{{*/
+ Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char *argv[], bool(*ShowHelp)(CommandLine &CmdL))
+{
+ CmdL = CommandLine(Args,_config);
+ if ((Cnf != NULL && pkgInitConfig(**Cnf) == false) ||
+ CmdL.Parse(argc,argv) == false ||
+ (Sys != NULL && pkgInitSystem(*_config, *Sys) == false))
+ {
+ if (_config->FindB("version") == true)
+ ShowHelp(CmdL);
+
+ _error->DumpErrors();
+ exit(100);
+ }
+
+ // See if the help should be shown
+ if (_config->FindB("help") == true || _config->FindB("version") == true)
+ {
+ ShowHelp(CmdL);
+ exit(0);
+ }
+ if (Cmds != NULL && CmdL.FileSize() == 0)
+ {
+ ShowHelp(CmdL);
+ exit(1);
+ }
+}
+ /*}}}*/
diff --git a/apt-private/private-cmndline.h b/apt-private/private-cmndline.h
index d0af16782..7b468456b 100644
--- a/apt-private/private-cmndline.h
+++ b/apt-private/private-cmndline.h
@@ -6,6 +6,12 @@
#include <vector>
+class Configuration;
+class pkgSystem;
+
APT_PUBLIC std::vector<CommandLine::Args> getCommandArgs(char const * const Program, char const * const Cmd);
+APT_PUBLIC void ParseCommandLine(CommandLine &CmdL, CommandLine::Dispatch * const Cmds, CommandLine::Args * const Args,
+ Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char * argv[],
+ bool(*ShowHelp)(CommandLine &CmdL));
#endif
diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index 2a4c3eea5..acc6d42c2 100644
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -94,7 +94,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask, bool Safety)
{
pkgSimulate PM(Cache);
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+#if APT_PKG_ABI >= 413
APT::Progress::PackageManager *progress = APT::Progress::PackageManagerProgressFactory();
pkgPackageManager::OrderResult Res = PM.DoInstall(progress);
delete progress;
@@ -116,7 +116,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask, bool Safety)
return false;
// Create the download object
- AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));
+ AcqTextStatus Stat(std::cout, ScreenWidth,_config->FindI("quiet",0));
pkgAcquire Fetcher(&Stat);
if (_config->FindB("APT::Get::Print-URIs", false) == true)
{
@@ -306,8 +306,8 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask, bool Safety)
}
_system->UnLock();
-
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
+
+#if APT_PKG_ABI >= 413
APT::Progress::PackageManager *progress = APT::Progress::PackageManagerProgressFactory();
pkgPackageManager::OrderResult Res = PM->DoInstall(progress);
delete progress;
diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc
index fc76a05bc..4e18030ab 100644
--- a/apt-private/private-output.cc
+++ b/apt-private/private-output.cc
@@ -52,14 +52,14 @@ static void SigWinch(int)
#endif
}
/*}}}*/
-bool InitOutput() /*{{{*/
+bool InitOutput(std::basic_streambuf<char> * const out) /*{{{*/
{
if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
_config->Set("quiet","1");
- c0out.rdbuf(cout.rdbuf());
- c1out.rdbuf(cout.rdbuf());
- c2out.rdbuf(cout.rdbuf());
+ c0out.rdbuf(out);
+ c1out.rdbuf(out);
+ c2out.rdbuf(out);
if (_config->FindI("quiet",0) > 0)
c0out.rdbuf(devnull.rdbuf());
if (_config->FindI("quiet",0) > 1)
diff --git a/apt-private/private-output.h b/apt-private/private-output.h
index e0dc9bf62..d5b57adec 100644
--- a/apt-private/private-output.h
+++ b/apt-private/private-output.h
@@ -6,6 +6,7 @@
#include <fstream>
#include <string>
+#include <iostream>
// forward declaration
class pkgCacheFile;
@@ -20,7 +21,7 @@ APT_PUBLIC extern std::ostream c2out;
APT_PUBLIC extern std::ofstream devnull;
APT_PUBLIC extern unsigned int ScreenWidth;
-APT_PUBLIC bool InitOutput();
+APT_PUBLIC bool InitOutput(std::basic_streambuf<char> * const out = std::cout.rdbuf());
void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records,
pkgCache::VerIterator const &V, std::ostream &out,
diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc
index 289f035a6..790bc0092 100644
--- a/apt-private/private-show.cc
+++ b/apt-private/private-show.cc
@@ -97,28 +97,30 @@ static bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V,
manual_installed = 0;
// FIXME: add verbose that does not do the removal of the tags?
- TFRewriteData RW[] = {
- // delete, apt-cache show has this info and most users do not care
- {"MD5sum", NULL, NULL},
- {"SHA1", NULL, NULL},
- {"SHA256", NULL, NULL},
- {"Filename", NULL, NULL},
- {"Multi-Arch", NULL, NULL},
- {"Architecture", NULL, NULL},
- {"Conffiles", NULL, NULL},
- // we use the translated description
- {"Description", NULL, NULL},
- {"Description-md5", NULL, NULL},
- // improve
- {"Installed-Size", installed_size.c_str(), NULL},
- {"Size", package_size.c_str(), "Download-Size"},
- // add
- {"APT-Manual-Installed", manual_installed, NULL},
- {"APT-Sources", source_index_file.c_str(), NULL},
- {NULL, NULL, NULL}
- };
-
- if(TFRewrite(stdout, Tags, NULL, RW) == false)
+ std::vector<pkgTagSection::Tag> RW;
+ // delete, apt-cache show has this info and most users do not care
+ RW.push_back(pkgTagSection::Tag::Remove("MD5sum"));
+ RW.push_back(pkgTagSection::Tag::Remove("SHA1"));
+ RW.push_back(pkgTagSection::Tag::Remove("SHA256"));
+ RW.push_back(pkgTagSection::Tag::Remove("SHA512"));
+ RW.push_back(pkgTagSection::Tag::Remove("Filename"));
+ RW.push_back(pkgTagSection::Tag::Remove("Multi-Arch"));
+ RW.push_back(pkgTagSection::Tag::Remove("Architecture"));
+ RW.push_back(pkgTagSection::Tag::Remove("Conffiles"));
+ // we use the translated description
+ RW.push_back(pkgTagSection::Tag::Remove("Description"));
+ RW.push_back(pkgTagSection::Tag::Remove("Description-md5"));
+ // improve
+ RW.push_back(pkgTagSection::Tag::Rewrite("Installed-Size", installed_size));
+ RW.push_back(pkgTagSection::Tag::Remove("Size"));
+ RW.push_back(pkgTagSection::Tag::Rewrite("Download-Size", package_size));
+ // add
+ RW.push_back(pkgTagSection::Tag::Rewrite("APT-Manual-Installed", manual_installed));
+ RW.push_back(pkgTagSection::Tag::Rewrite("APT-Sources", source_index_file));
+
+ FileFd stdoutfd;
+ if (stdoutfd.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly, false) == false ||
+ Tags.Write(stdoutfd, TFRewritePackageOrder, RW) == false || stdoutfd.Close() == false)
return _error->Error("Internal Error, Unable to parse a package record");
// write the description
diff --git a/apt-private/private-update.cc b/apt-private/private-update.cc
index df77ac33a..73a82e988 100644
--- a/apt-private/private-update.cc
+++ b/apt-private/private-update.cc
@@ -38,8 +38,8 @@ bool DoUpdate(CommandLine &CmdL)
pkgSourceList *List = Cache.GetSourceList();
// Create the progress
- AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));
-
+ AcqTextStatus Stat(std::cout, ScreenWidth,_config->FindI("quiet",0));
+
// Just print out the uris an exit if the --print-uris flag was used
if (_config->FindB("APT::Get::Print-URIs") == true)
{
diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index c0fd2e8c6..66ab33c2b 100644
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -50,3 +50,6 @@
#define APT_8_CLEANER_HEADERS
#define APT_9_CLEANER_HEADERS
#define APT_10_CLEANER_HEADERS
+
+/* unrolling is faster combined with an optimizing compiler */
+#define SHA2_UNROLL_TRANSFORM
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 0f4f7e1ce..c2f6dbd5c 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -116,7 +116,7 @@ static bool ShowUnMet(pkgCache::VerIterator const &V, bool const Important)
continue;
// Skip conflicts and replaces
- if (End.IsNegative() == true)
+ if (End.IsNegative() == true || End->Type == pkgCache::Dep::Replaces)
continue;
// Verify the or group
@@ -133,7 +133,7 @@ static bool ShowUnMet(pkgCache::VerIterator const &V, bool const Important)
break;
}
delete [] VList;
-
+
if (Start == End)
break;
++Start;
@@ -267,11 +267,14 @@ static bool DumpPackage(CommandLine &CmdL)
// ShowHashTableStats - Show stats about a hashtable /*{{{*/
// ---------------------------------------------------------------------
/* */
+static map_pointer_t PackageNext(pkgCache::Package const * const P) { return P->NextPackage; }
+static map_pointer_t GroupNext(pkgCache::Group const * const G) { return G->Next; }
template<class T>
static void ShowHashTableStats(std::string Type,
T *StartP,
map_pointer_t *Hashtable,
- unsigned long Size)
+ unsigned long Size,
+ map_pointer_t(*Next)(T const * const))
{
// hashtable stats for the HashTable
unsigned long NumBuckets = Size;
@@ -290,7 +293,7 @@ static void ShowHashTableStats(std::string Type,
}
++UsedBuckets;
unsigned long ThisBucketSize = 0;
- for (; P != StartP; P = StartP + P->Next)
+ for (; P != StartP; P = StartP + Next(P))
++ThisBucketSize;
Entries += ThisBucketSize;
LongestBucket = std::max(ThisBucketSize, LongestBucket);
@@ -389,8 +392,10 @@ static bool Stats(CommandLine &)
stritems.insert(V->VerStr);
if (V->Section != 0)
stritems.insert(V->Section);
+#if APT_PKG_ABI >= 413
stritems.insert(V->SourcePkgName);
stritems.insert(V->SourceVerStr);
+#endif
for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; ++D)
{
if (D->Version != 0)
@@ -408,17 +413,21 @@ static bool Stats(CommandLine &)
stritems.insert(Prv->ProvideVersion);
}
}
- for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); ++F)
+ for (pkgCache::RlsFileIterator F = Cache->RlsFileBegin(); F != Cache->RlsFileEnd(); ++F)
{
stritems.insert(F->FileName);
stritems.insert(F->Archive);
stritems.insert(F->Codename);
- stritems.insert(F->Component);
stritems.insert(F->Version);
stritems.insert(F->Origin);
stritems.insert(F->Label);
- stritems.insert(F->Architecture);
stritems.insert(F->Site);
+ }
+ for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F != Cache->FileEnd(); ++F)
+ {
+ stritems.insert(F->FileName);
+ stritems.insert(F->Architecture);
+ stritems.insert(F->Component);
stritems.insert(F->IndexType);
}
unsigned long Size = 0;
@@ -441,17 +450,18 @@ static bool Stats(CommandLine &)
APT_CACHESIZE(VersionCount, VersionSz) +
APT_CACHESIZE(DescriptionCount, DescriptionSz) +
APT_CACHESIZE(DependsCount, DependencySz) +
+ APT_CACHESIZE(ReleaseFileCount, ReleaseFileSz) +
APT_CACHESIZE(PackageFileCount, PackageFileSz) +
APT_CACHESIZE(VerFileCount, VerFileSz) +
APT_CACHESIZE(DescFileCount, DescFileSz) +
APT_CACHESIZE(ProvidesCount, ProvidesSz) +
- (2 * Cache->Head().HashTableSize * sizeof(map_id_t));
+ (2 * Cache->Head().GetHashTableSize() * sizeof(map_id_t));
cout << _("Total space accounted for: ") << SizeToStr(Total) << endl;
#undef APT_CACHESIZE
// hashtable stats
- ShowHashTableStats<pkgCache::Package>("PkgHashTable", Cache->PkgP, Cache->Head().PkgHashTable(), Cache->Head().HashTableSize);
- ShowHashTableStats<pkgCache::Group>("GrpHashTable", Cache->GrpP, Cache->Head().GrpHashTable(), Cache->Head().HashTableSize);
+ ShowHashTableStats<pkgCache::Package>("PkgHashTable", Cache->PkgP, Cache->Head().PkgHashTableP(), Cache->Head().GetHashTableSize(), PackageNext);
+ ShowHashTableStats<pkgCache::Group>("GrpHashTable", Cache->GrpP, Cache->Head().GrpHashTableP(), Cache->Head().GetHashTableSize(), GroupNext);
return true;
}
@@ -575,6 +585,12 @@ static bool DumpAvail(CommandLine &)
LocalitySort(VFList,Count,sizeof(*VFList));
+ std::vector<pkgTagSection::Tag> RW;
+ RW.push_back(pkgTagSection::Tag::Remove("Status"));
+ RW.push_back(pkgTagSection::Tag::Remove("Config-Version"));
+ FileFd stdoutfd;
+ stdoutfd.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly, false);
+
// 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;)
@@ -615,35 +631,32 @@ static bool DumpAvail(CommandLine &)
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", NULL, NULL},{"Config-Version", NULL, NULL},{NULL, NULL, NULL}};
- const char *Zero = 0;
if (Tags.Scan(Buffer+Jitter,VF.Size+1) == false ||
- TFRewrite(stdout,Tags,&Zero,RW) == false)
+ Tags.Write(stdoutfd, NULL, RW) == false ||
+ stdoutfd.Write("\n", 1) == 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)
+ if (stdoutfd.Write(Buffer + Jitter, VF.Size + 1) == false)
break;
}
-
+
Pos = VF.Offset + VF.Size;
}
- fflush(stdout);
if (_error->PendingError() == true)
break;
}
-
+
delete [] Buffer;
delete [] VFList;
return !_error->PendingError();
@@ -1625,6 +1638,8 @@ static bool Policy(CommandLine &CmdL)
cout << _("Package files:") << endl;
for (pkgCache::PkgFileIterator F = Cache->FileBegin(); F.end() == false; ++F)
{
+ if (F.Flagged(pkgCache::Flag::NoPackages))
+ continue;
// Locate the associated index files so we can derive a description
pkgIndexFile *Indx;
if (SrcList->FindIndex(F,Indx) == false &&
@@ -1819,9 +1834,8 @@ static bool GenCaches(CommandLine &)
/* */
static bool ShowHelp(CommandLine &)
{
- ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
- COMMON_ARCH,__DATE__,__TIME__);
-
+ ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
+
if (_config->FindB("version") == true)
return true;
@@ -1891,26 +1905,10 @@ int main(int argc,const char *argv[]) /*{{{*/
textdomain(PACKAGE);
// Parse the command line and initialize the package library
- CommandLine CmdL(Args.data(),_config);
- if (pkgInitConfig(*_config) == false ||
- CmdL.Parse(argc,argv) == false ||
- pkgInitSystem(*_config,_system) == false)
- {
- _error->DumpErrors();
- return 100;
- }
+ CommandLine CmdL;
+ ParseCommandLine(CmdL, Cmds, Args.data(), &_config, &_system, argc, argv, ShowHelp);
- // 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", -1) == -1)
- _config->Set("quiet","1");
+ InitOutput();
if (_config->Exists("APT::Cache::Generate") == true)
_config->Set("pkgCacheFile::Generate", _config->FindB("APT::Cache::Generate", true));
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 53efe65b8..d95c169cd 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -31,6 +31,7 @@
#include <unistd.h>
#include <apt-private/private-cmndline.h>
+#include <apt-private/private-output.h>
#include <apti18n.h>
/*}}}*/
@@ -204,8 +205,8 @@ static bool DoIdent(CommandLine &)
// ShowHelp - Show the help screen /*{{{*/
static bool ShowHelp(CommandLine &)
{
- ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
- COMMON_ARCH,__DATE__,__TIME__);
+ ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
+
if (_config->FindB("version") == true)
return true;
@@ -249,24 +250,11 @@ int main(int argc,const char *argv[]) /*{{{*/
textdomain(PACKAGE);
// Parse the command line and initialize the package library
- CommandLine CmdL(Args.data(),_config);
- if (pkgInitConfig(*_config) == false ||
- CmdL.Parse(argc,argv) == false ||
- pkgInitSystem(*_config,_system) == false)
- {
- _error->DumpErrors();
- return 100;
- }
+ CommandLine CmdL;
+ ParseCommandLine(CmdL, Cmds, Args.data(), &_config, &_system, argc, argv, ShowHelp);
- // See if the help should be shown
- if (_config->FindB("help") == true || _config->FindB("version") == true ||
- CmdL.FileSize() == 0)
- return ShowHelp(CmdL);
+ InitOutput();
- // Deal with stdout not being a tty
- if (isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
- _config->Set("quiet","1");
-
// Match the operation
bool returned = CmdL.DispatchArg(Cmds);
diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index 40ba468eb..4479b84a7 100644
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -80,11 +80,10 @@ static bool DoDump(CommandLine &CmdL)
/* */
static bool ShowHelp(CommandLine &)
{
- ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
- COMMON_ARCH,__DATE__,__TIME__);
+ ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
if (_config->FindB("version") == true)
return true;
-
+
cout <<
_("Usage: apt-config [options] command\n"
"\n"
@@ -115,19 +114,8 @@ int main(int argc,const char *argv[]) /*{{{*/
textdomain(PACKAGE);
// Parse the command line and initialize the package library
- CommandLine CmdL(Args.data(),_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(CmdL);
+ CommandLine CmdL;
+ ParseCommandLine(CmdL, Cmds, Args.data(), &_config, &_system, argc, argv, ShowHelp);
std::vector<std::string> const langs = APT::Configuration::getLanguages(true);
_config->Clear("Acquire::Languages");
diff --git a/cmdline/apt-dump-solver.cc b/cmdline/apt-dump-solver.cc
index f765234c5..4729eac55 100644
--- a/cmdline/apt-dump-solver.cc
+++ b/cmdline/apt-dump-solver.cc
@@ -21,9 +21,8 @@
// ---------------------------------------------------------------------
/* */
static bool ShowHelp() {
-
+ ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
std::cout <<
- PACKAGE " " PACKAGE_VERSION " for " COMMON_ARCH " compiled on " __DATE__ " " __TIME__ << std::endl <<
"Usage: apt-dump-resolver\n"
"\n"
"apt-dump-resolver is a dummy solver who just dumps its input to the\n"
diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index f95b9e5ba..3e4f89286 100644
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -33,6 +33,8 @@
#include <apt-pkg/dirstream.h>
#include <apt-pkg/mmap.h>
+#include <apt-private/private-cmndline.h>
+
#include <iostream>
#include <stdio.h>
#include <string.h>
@@ -215,15 +217,14 @@ bool DebFile::ParseInfo()
// ShowHelp - show a short help text /*{{{*/
// ---------------------------------------------------------------------
/* */
-static int ShowHelp(void)
+static bool ShowHelp(CommandLine &)
{
- ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
- COMMON_ARCH,__DATE__,__TIME__);
+ ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
- if (_config->FindB("version") == true)
- return 0;
+ if (_config->FindB("version") == true)
+ return true;
- cout <<
+ cout <<
_("Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
"apt-extracttemplates is a tool to extract config and template info\n"
@@ -234,7 +235,7 @@ static int ShowHelp(void)
" -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;
+ return true;
}
/*}}}*/
// WriteFile - write the contents of the passed string to a file /*{{{*/
@@ -356,20 +357,10 @@ int main(int argc, const char **argv) /*{{{*/
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();
-
+ CommandLine::Dispatch Cmds[] = {{NULL, NULL}};
+ CommandLine CmdL;
+ ParseCommandLine(CmdL, Cmds, Args, &_config, &_system, argc, argv, ShowHelp);
+
Go(CmdL);
// Print any errors or warnings found during operation
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index b6786faf8..184b51d23 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -86,6 +86,7 @@
#include <algorithm>
#include <fstream>
#include <iostream>
+#include <sstream>
#include <set>
#include <string>
#include <vector>
@@ -136,28 +137,6 @@ static bool TryToInstallBuildDep(pkgCache::PkgIterator Pkg,pkgCacheFile &Cache,
return true;
}
/*}}}*/
-
-
-// helper that can go wit hthe next ABI break
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)
-static std::string MetaIndexFileNameOnDisk(metaIndex *metaindex)
-{
- // FIXME: this cast is the horror, the horror
- debReleaseIndex *r = (debReleaseIndex*)metaindex;
-
- // see if we have a InRelease file
- std::string PathInRelease = r->MetaIndexFile("InRelease");
- if (FileExists(PathInRelease))
- return PathInRelease;
-
- // and if not return the normal one
- if (FileExists(PathInRelease))
- return r->MetaIndexFile("Release");
-
- return "";
-}
-#endif
-
// GetReleaseForSourceRecord - Return Suite for the given srcrecord /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -176,12 +155,8 @@ static std::string GetReleaseForSourceRecord(pkgSourceList *SrcList,
{
if (&CurrentIndexFile == (*IF))
{
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)
- std::string path = MetaIndexFileNameOnDisk(*S);
-#else
- std::string path = (*S)->LocalFileName();
-#endif
- if (path != "")
+ std::string const path = (*S)->LocalFileName();
+ if (path != "")
{
indexRecords records;
records.Load(path);
@@ -196,7 +171,11 @@ static std::string GetReleaseForSourceRecord(pkgSourceList *SrcList,
// FindSrc - Find a source record /*{{{*/
// ---------------------------------------------------------------------
/* */
+#if APT_PKG_ABI >= 413
static pkgSrcRecords::Parser *FindSrc(const char *Name,
+#else
+static pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
+#endif
pkgSrcRecords &SrcRecs,string &Src,
CacheFile &CacheFile)
{
@@ -304,10 +283,21 @@ static pkgSrcRecords::Parser *FindSrc(const char *Name,
(VF.File().Archive() != 0 && VF.File().Archive() == RelTag) ||
(VF.File().Codename() != 0 && VF.File().Codename() == RelTag))
{
- Src = Ver.SourcePkgName();
// the Version we have is possibly fuzzy or includes binUploads,
- // so we use the Version of the SourcePkg
+ // so we use the Version of the SourcePkg (empty if same as package)
+#if APT_PKG_ABI >= 413
+ Src = Ver.SourcePkgName();
VerTag = Ver.SourceVerStr();
+#else
+ pkgRecords::Parser &Parse = Recs.Lookup(VF);
+ Src = Parse.SourcePkg();
+ // no SourcePkg name, so it is the "binary" name
+ if (Src.empty() == true)
+ Src = TmpSrc;
+ VerTag = Parse.SourceVer();
+ if (VerTag.empty() == true)
+ VerTag = Ver.VerStr();
+#endif
break;
}
}
@@ -338,10 +328,17 @@ static pkgSrcRecords::Parser *FindSrc(const char *Name,
pkgCache::VerIterator Ver = Cache->GetCandidateVer(Pkg);
if (Ver.end() == false)
{
+#if APT_PKG_ABI >= 413
if (strcmp(Ver.SourcePkgName(),Ver.ParentPkg().Name()) != 0)
Src = Ver.SourcePkgName();
if (VerTag.empty() == true && strcmp(Ver.SourceVerStr(),Ver.VerStr()) != 0)
VerTag = Ver.SourceVerStr();
+#else
+ pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList());
+ Src = Parse.SourcePkg();
+ if (VerTag.empty() == true)
+ VerTag = Parse.SourceVer();
+#endif
}
}
}
@@ -562,30 +559,12 @@ static bool DoClean(CommandLine &)
return true;
}
- bool const NoLocking = _config->FindB("Debug::NoLocking",false);
- // Lock the archive directory
- FileFd Lock;
- if (NoLocking == false)
- {
- int lock_fd = GetLock(archivedir + "lock");
- if (lock_fd < 0)
- return _error->Error(_("Unable to lock directory %s"), archivedir.c_str());
- Lock.Fd(lock_fd);
- }
-
pkgAcquire Fetcher;
+ Fetcher.GetLock(archivedir);
Fetcher.Clean(archivedir);
Fetcher.Clean(archivedir + "partial/");
- if (NoLocking == false)
- {
- Lock.Close();
- int lock_fd = GetLock(listsdir + "lock");
- if (lock_fd < 0)
- return _error->Error(_("Unable to lock directory %s"), listsdir.c_str());
- Lock.Fd(lock_fd);
- }
-
+ Fetcher.GetLock(listsdir);
Fetcher.Clean(listsdir + "partial/");
pkgCacheFile::RemoveCaches();
@@ -639,14 +618,14 @@ static bool DoDownload(CommandLine &CmdL)
if (Cache.ReadOnlyOpen() == false)
return false;
- APT::CacheSetHelper helper(c0out);
+ APT::CacheSetHelper helper;
APT::VersionSet verset = APT::VersionSet::FromCommandLine(Cache,
CmdL.FileList + 1, APT::CacheSetHelper::CANDIDATE, helper);
if (verset.empty() == true)
return false;
- AcqTextStatus Stat(ScreenWidth, _config->FindI("quiet", 0));
+ AcqTextStatus Stat(std::cout, ScreenWidth,_config->FindI("quiet",0));
pkgAcquire Fetcher(&Stat);
pkgRecords Recs(Cache);
@@ -743,12 +722,15 @@ static bool DoSource(CommandLine &CmdL)
pkgSourceList *List = Cache.GetSourceList();
// Create the text record parsers
+#if APT_PKG_ABI < 413
+ pkgRecords Recs(Cache);
+#endif
pkgSrcRecords SrcRecs(*List);
if (_error->PendingError() == true)
return false;
// Create the download object
- AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));
+ AcqTextStatus Stat(std::cout, ScreenWidth,_config->FindI("quiet",0));
pkgAcquire Fetcher(&Stat);
SPtrArray<DscFile> Dsc = new DscFile[CmdL.FileSize()];
@@ -770,8 +752,11 @@ static bool DoSource(CommandLine &CmdL)
for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++)
{
string Src;
+#if APT_PKG_ABI >= 413
pkgSrcRecords::Parser *Last = FindSrc(*I,SrcRecs,Src,Cache);
-
+#else
+ pkgSrcRecords::Parser *Last = FindSrc(*I,Recs,SrcRecs,Src,Cache);
+#endif
if (Last == 0) {
return _error->Error(_("Unable to find a source package for %s"),Src.c_str());
}
@@ -807,13 +792,13 @@ static bool DoSource(CommandLine &CmdL)
}
// Back track
- vector<pkgSrcRecords::File> Lst;
- if (Last->Files(Lst) == false) {
+ vector<pkgSrcRecords::File2> Lst;
+ if (Last->Files2(Lst) == false) {
return false;
}
// Load them into the fetcher
- for (vector<pkgSrcRecords::File>::const_iterator I = Lst.begin();
+ for (vector<pkgSrcRecords::File2>::const_iterator I = Lst.begin();
I != Lst.end(); ++I)
{
// Try to guess what sort of file it is we are getting.
@@ -860,7 +845,7 @@ static bool DoSource(CommandLine &CmdL)
}
new pkgAcqFile(&Fetcher,Last->Index().ArchiveURI(I->Path),
- I->Hashes, I->Size, Last->Index().SourceInfo(*Last,*I), Src);
+ I->Hashes, I->FileSize, Last->Index().SourceInfo(*Last,*I), Src);
}
}
@@ -1030,6 +1015,9 @@ static bool DoBuildDep(CommandLine &CmdL)
pkgSourceList *List = Cache.GetSourceList();
// Create the text record parsers
+#if APT_PKG_ABI < 413
+ pkgRecords Recs(Cache);
+#endif
pkgSrcRecords SrcRecs(*List);
if (_error->PendingError() == true)
return false;
@@ -1076,7 +1064,11 @@ static bool DoBuildDep(CommandLine &CmdL)
Last = Type->CreateSrcPkgParser(*I);
} else {
// normal case, search the cache for the source file
- Last = FindSrc(*I,SrcRecs,Src,Cache);
+#if APT_PKG_ABI >= 413
+ Last = FindSrc(*I,SrcRecs,Src,Cache);
+#else
+ Last = FindSrc(*I,Recs,SrcRecs,Src,Cache);
+#endif
}
if (Last == 0)
@@ -1418,187 +1410,175 @@ static bool DoBuildDep(CommandLine &CmdL)
return true;
}
/*}}}*/
-// GetChangelogPath - return a path pointing to a changelog file or dir /*{{{*/
-// ---------------------------------------------------------------------
-/* This returns a "path" string for the changelog url construction.
- * Please note that its not complete, it either needs a "/changelog"
- * appended (for the packages.debian.org/changelogs site) or a
- * ".changelog" (for third party sites that store the changelog in the
- * pool/ next to the deb itself)
- * Example return: "pool/main/a/apt/apt_0.8.8ubuntu3"
- */
-static string GetChangelogPath(CacheFile &Cache,
- pkgCache::VerIterator Ver)
-{
- pkgRecords Recs(Cache);
- pkgRecords::Parser &rec=Recs.Lookup(Ver.FileList());
- string path = flNotFile(rec.FileName());
- path.append(Ver.SourcePkgName());
- path.append("_");
- path.append(StripEpoch(Ver.SourceVerStr()));
- return path;
-}
- /*}}}*/
-// GuessThirdPartyChangelogUri - return url /*{{{*/
-// ---------------------------------------------------------------------
-/* Contruct a changelog file path for third party sites that do not use
- * packages.debian.org/changelogs
- * This simply uses the ArchiveURI() of the source pkg and looks for
- * a .changelog file there, Example for "mediabuntu":
- * apt-get changelog mplayer-doc:
- * http://packages.medibuntu.org/pool/non-free/m/mplayer/mplayer_1.0~rc4~try1.dsfg1-1ubuntu1+medibuntu1.changelog
- */
-static bool GuessThirdPartyChangelogUri(CacheFile &Cache,
- pkgCache::VerIterator Ver,
- string &out_uri)
+// DoChangelog - Get changelog from the command line /*{{{*/
+static bool DoChangelog(CommandLine &CmdL)
{
- // get the binary deb server path
- pkgCache::VerFileIterator Vf = Ver.FileList();
- if (Vf.end() == true)
+ CacheFile Cache;
+ if (Cache.ReadOnlyOpen() == false)
return false;
- pkgCache::PkgFileIterator F = Vf.File();
- pkgIndexFile *index;
- pkgSourceList *SrcList = Cache.GetSourceList();
- if(SrcList->FindIndex(F, index) == false)
+
+ APT::CacheSetHelper helper;
+ APT::VersionList verset = APT::VersionList::FromCommandLine(Cache,
+ CmdL.FileList + 1, APT::CacheSetHelper::CANDIDATE, helper);
+ if (verset.empty() == true)
return false;
+ pkgAcquire Fetcher;
+ AcqTextStatus Stat(std::cout, ScreenWidth,_config->FindI("quiet",0));
+ Fetcher.SetLog(&Stat);
- // get archive uri for the binary deb
- string path_without_dot_changelog = GetChangelogPath(Cache, Ver);
- out_uri = index->ArchiveURI(path_without_dot_changelog + ".changelog");
+ bool const downOnly = _config->FindB("APT::Get::Download-Only", false);
+ bool const printOnly = _config->FindB("APT::Get::Print-URIs", false);
- // now strip away the filename and add srcpkg_srcver.changelog
- return true;
-}
- /*}}}*/
-// DownloadChangelog - Download the changelog /*{{{*/
-// ---------------------------------------------------------------------
-static bool DownloadChangelog(CacheFile &CacheFile, pkgAcquire &Fetcher,
- pkgCache::VerIterator Ver, string targetfile)
-/* Download a changelog file for the given package version to
- * targetfile. This will first try the server from Apt::Changelogs::Server
- * (http://packages.debian.org/changelogs by default) and if that gives
- * a 404 tries to get it from the archive directly (see
- * GuessThirdPartyChangelogUri for details how)
- */
-{
- // make the server root configurable
- string const server = _config->Find("Apt::Changelogs::Server",
- "http://packages.debian.org/changelogs");
- string const path = GetChangelogPath(CacheFile, Ver);
- string changelog_uri;
- if (APT::String::Endswith(server, "/") == true)
- strprintf(changelog_uri, "%s%s/changelog", server.c_str(), path.c_str());
- else
- strprintf(changelog_uri, "%s/%s/changelog", server.c_str(), path.c_str());
- if (_config->FindB("APT::Get::Print-URIs", false) == true)
+ for (APT::VersionList::const_iterator Ver = verset.begin();
+ Ver != verset.end();
+ ++Ver)
{
- std::cout << '\'' << changelog_uri << '\'' << std::endl;
- return true;
+ if (printOnly)
+ new pkgAcqChangelog(&Fetcher, Ver, "/dev/null");
+ else if (downOnly)
+ new pkgAcqChangelog(&Fetcher, Ver, ".");
+ else
+ new pkgAcqChangelog(&Fetcher, Ver);
}
- pkgCache::PkgIterator const Pkg = Ver.ParentPkg();
- string descr;
- strprintf(descr, _("Changelog for %s (%s)"), Pkg.Name(), changelog_uri.c_str());
- // queue it
- pkgAcquire::Item const * itm = new pkgAcqFile(&Fetcher, changelog_uri, "", 0, descr, Pkg.Name(), "ignored", targetfile);
+ if (printOnly == false)
+ {
+ // Disable drop-privs if "_apt" can not write to the target dir
+ CheckDropPrivsMustBeDisabled(Fetcher);
+ if (_error->PendingError() == true)
+ return false;
- // Disable drop-privs if "_apt" can not write to the target dir
- CheckDropPrivsMustBeDisabled(Fetcher);
+ bool Failed = false;
+ if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true)
+ return false;
+ }
- // try downloading it, if that fails, try third-party-changelogs location
- // FIXME: Fetcher.Run() is "Continue" even if I get a 404?!?
- Fetcher.Run();
- if (itm->Status != pkgAcquire::Item::StatDone)
+ if (downOnly == false || printOnly == true)
{
- string third_party_uri;
- if (GuessThirdPartyChangelogUri(CacheFile, Ver, third_party_uri))
+ bool Failed = false;
+ for (pkgAcquire::ItemIterator I = Fetcher.ItemsBegin(); I != Fetcher.ItemsEnd(); ++I)
{
- strprintf(descr, _("Changelog for %s (%s)"), Pkg.Name(), third_party_uri.c_str());
- itm = new pkgAcqFile(&Fetcher, third_party_uri, "", 0, descr, Pkg.Name(), "ignored", targetfile);
- Fetcher.Run();
+ if (printOnly)
+ {
+ if ((*I)->ErrorText.empty() == false)
+ {
+ Failed = true;
+ _error->Error("%s", (*I)->ErrorText.c_str());
+ }
+ else
+ cout << '\'' << (*I)->DescURI() << "' " << flNotDir((*I)->DestFile) << std::endl;
+ }
+ else
+ DisplayFileInPager((*I)->DestFile);
}
+ return Failed == false;
}
- if (itm->Status == pkgAcquire::Item::StatDone)
- return true;
-
- // error
- return _error->Error("changelog download failed");
+ return true;
}
/*}}}*/
-// DoChangelog - Get changelog from the command line /*{{{*/
-// ---------------------------------------------------------------------
-static bool DoChangelog(CommandLine &CmdL)
+// DoFiles - Lists all IndexTargets /*{{{*/
+static std::string format_key(std::string key)
{
- CacheFile Cache;
- if (Cache.ReadOnlyOpen() == false)
- return false;
-
- APT::CacheSetHelper helper(c0out);
- APT::VersionList verset = APT::VersionList::FromCommandLine(Cache,
- CmdL.FileList + 1, APT::CacheSetHelper::CANDIDATE, helper);
- if (verset.empty() == true)
- return false;
- pkgAcquire Fetcher;
-
- if (_config->FindB("APT::Get::Print-URIs", false) == true)
+ // deb822 is case-insensitive, but the human eye prefers candy
+ std::transform(key.begin(), key.end(), key.begin(), ::tolower);
+ key[0] = ::toupper(key[0]);
+ size_t found = key.find("_uri");
+ if (found != std::string::npos)
+ key.replace(found, 4, "-URI");
+ while ((found = key.find('_')) != std::string::npos)
{
- bool Success = true;
- for (APT::VersionList::const_iterator Ver = verset.begin();
- Ver != verset.end(); ++Ver)
- Success &= DownloadChangelog(Cache, Fetcher, Ver, "");
- return Success;
+ key[found] = '-';
+ key[found + 1] = ::toupper(key[found + 1]);
}
+ return key;
+}
+static bool DoFiles(CommandLine &CmdL)
+{
+ pkgCacheFile CacheFile;
+ pkgSourceList *SrcList = CacheFile.GetSourceList();
- AcqTextStatus Stat(ScreenWidth, _config->FindI("quiet",0));
- Fetcher.SetLog(&Stat);
-
- bool const downOnly = _config->FindB("APT::Get::Download-Only", false);
+ if (SrcList == NULL)
+ return false;
- char tmpname[100];
- const char* tmpdir = NULL;
- if (downOnly == false)
+ std::string const Format = _config->Find("APT::Get::Files::Format");
+ bool const ReleaseInfo = _config->FindB("APT::Get::Files::ReleaseInfo", true);
+ bool Filtered = CmdL.FileSize() > 1;
+ for (pkgSourceList::const_iterator S = SrcList->begin(); S != SrcList->end(); ++S)
{
- std::string systemTemp = GetTempDir();
- snprintf(tmpname, sizeof(tmpname), "%s/apt-changelog-XXXXXX",
- systemTemp.c_str());
- tmpdir = mkdtemp(tmpname);
- if (tmpdir == NULL)
- return _error->Errno("mkdtemp", "mkdtemp failed");
-
- std::string const SandboxUser = _config->Find("APT::Sandbox::User");
- if (getuid() == 0 && SandboxUser.empty() == false) // if we aren't root, we can't chown, so don't try it
+ std::vector<IndexTarget> const targets = (*S)->GetIndexTargets();
+ std::map<std::string, string> AddOptions;
+ if (ReleaseInfo)
{
- struct passwd const * const pw = getpwnam(SandboxUser.c_str());
- struct group const * const gr = getgrnam("root");
- if (pw != NULL && gr != NULL)
- {
- // chown the tmp dir directory we use to the sandbox user
- if(chown(tmpdir, pw->pw_uid, gr->gr_gid) != 0)
- _error->WarningE("DoChangelog", "chown to %s:%s of directory %s failed", SandboxUser.c_str(), "root", tmpdir);
- }
+ AddOptions.insert(std::make_pair("TRUSTED", ((*S)->IsTrusted() ? "yes" : "no")));
+ pkgCache &Cache = *CacheFile.GetPkgCache();
+ pkgCache::RlsFileIterator const RlsFile = (*S)->FindInCache(Cache, false);
+ if (RlsFile.end())
+ continue;
+#define APT_RELEASE(X,Y) if (RlsFile.Y() != NULL) AddOptions.insert(std::make_pair(X, RlsFile.Y()))
+ APT_RELEASE("CODENAME", Codename);
+ APT_RELEASE("SUITE", Archive);
+ APT_RELEASE("VERSION", Version);
+ APT_RELEASE("ORIGIN", Origin);
+ APT_RELEASE("LABEL", Label);
+#undef APT_RELEASE
}
- }
- for (APT::VersionList::const_iterator Ver = verset.begin();
- Ver != verset.end();
- ++Ver)
- {
- string changelogfile;
- if (downOnly == false)
- changelogfile.append(tmpname).append("/changelog");
- else
- changelogfile.append(Ver.ParentPkg().Name()).append(".changelog");
- if (DownloadChangelog(Cache, Fetcher, Ver, changelogfile) && downOnly == false)
+ for (std::vector<IndexTarget>::const_iterator T = targets.begin(); T != targets.end(); ++T)
{
- DisplayFileInPager(changelogfile);
- // cleanup temp file
- unlink(changelogfile.c_str());
+ std::string filename = T->Option(ReleaseInfo ? IndexTarget::EXISTING_FILENAME : IndexTarget::FILENAME);
+ if (filename.empty())
+ continue;
+
+ std::ostringstream stanza;
+ if (Filtered || Format.empty())
+ {
+ stanza << "MetaKey: " << T->MetaKey << "\n"
+ << "ShortDesc: " << T->ShortDesc << "\n"
+ << "Description: " << T->Description << "\n"
+ << "URI: " << T->URI << "\n"
+ << "Filename: " << filename << "\n"
+ << "Optional: " << (T->IsOptional ? "yes" : "no") << "\n";
+ for (std::map<std::string,std::string>::const_iterator O = AddOptions.begin(); O != AddOptions.end(); ++O)
+ stanza << format_key(O->first) << ": " << O->second << "\n";
+ for (std::map<std::string,std::string>::const_iterator O = T->Options.begin(); O != T->Options.end(); ++O)
+ stanza << format_key(O->first) << ": " << O->second << "\n";
+ stanza << "\n";
+
+ if (Filtered)
+ {
+ // that is a bit crude, but good enough for now
+ bool found = true;
+ std::string haystack = std::string("\n") + stanza.str() + "\n";
+ std::transform(haystack.begin(), haystack.end(), haystack.begin(), ::tolower);
+ size_t const filesize = CmdL.FileSize() - 1;
+ for (size_t i = 0; i != filesize; ++i)
+ {
+ std::string needle = std::string("\n") + CmdL.FileList[i + 1] + "\n";
+ std::transform(needle.begin(), needle.end(), needle.begin(), ::tolower);
+ if (haystack.find(needle) != std::string::npos)
+ continue;
+ found = false;
+ break;
+ }
+ if (found == false)
+ continue;
+ }
+ }
+
+ if (Format.empty())
+ cout << stanza.str();
+ else
+ {
+ std::string out = SubstVar(Format, "$(FILENAME)", filename);
+ out = T->Format(out);
+ for (std::map<std::string,std::string>::const_iterator O = AddOptions.begin(); O != AddOptions.end(); ++O)
+ out = SubstVar(out, std::string("$(") + O->first + ")", O->second);
+ cout << out << std::endl;
+ }
}
}
- // clenaup tmp dir
- if (tmpdir != NULL)
- rmdir(tmpdir);
+
return true;
}
/*}}}*/
@@ -1607,13 +1587,12 @@ static bool DoChangelog(CommandLine &CmdL)
/* */
static bool ShowHelp(CommandLine &)
{
- ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
- COMMON_ARCH,__DATE__,__TIME__);
-
+ ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
+
if (_config->FindB("version") == true)
{
cout << _("Supported modules:") << endl;
-
+
for (unsigned I = 0; I != pkgVersioningSystem::GlobalListLen; I++)
{
pkgVersioningSystem *VS = pkgVersioningSystem::GlobalList[I];
@@ -1622,7 +1601,7 @@ static bool ShowHelp(CommandLine &)
else
cout << ' ';
cout << "Ver: " << VS->Label << endl;
-
+
/* Print out all the packaging systems that will work with
this VS */
for (unsigned J = 0; J != pkgSystem::GlobalListLen; J++)
@@ -1717,6 +1696,7 @@ int main(int argc,const char *argv[]) /*{{{*/
{"source",&DoSource},
{"download",&DoDownload},
{"changelog",&DoChangelog},
+ {"files",&DoFiles},
{"moo",&DoMoo},
{"help",&ShowHelp},
{0,0}};
@@ -1728,26 +1708,8 @@ int main(int argc,const char *argv[]) /*{{{*/
textdomain(PACKAGE);
// Parse the command line and initialize the package library
- CommandLine CmdL(Args.data(),_config);
- if (pkgInitConfig(*_config) == false ||
- CmdL.Parse(argc,argv) == false ||
- pkgInitSystem(*_config,_system) == false)
- {
- if (_config->FindB("version") == true)
- ShowHelp(CmdL);
-
- _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;
- }
+ CommandLine CmdL;
+ ParseCommandLine(CmdL, Cmds, Args.data(), &_config, &_system, argc, argv, ShowHelp);
// see if we are in simulate mode
CheckSimulateMode(CmdL);
diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index 27abb2013..a97fc903f 100644
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -48,32 +48,42 @@ static bool DoDownloadFile(CommandLine &CmdL)
if (CmdL.FileSize() <= 2)
return _error->Error(_("Must specify at least one pair url/filename"));
- AcqTextStatus Stat(ScreenWidth, _config->FindI("quiet",0));
+ AcqTextStatus Stat(std::cout, ScreenWidth,_config->FindI("quiet",0));
pkgAcquire Fetcher(&Stat);
- std::string download_uri = CmdL.FileList[1];
- std::string targetfile = CmdL.FileList[2];
- std::string hash;
- if (CmdL.FileSize() > 3)
- hash = CmdL.FileList[3];
- // we use download_uri as descr and targetfile as short-descr
- new pkgAcqFile(&Fetcher, download_uri, hash, 0, download_uri, targetfile,
- "dest-dir-ignored", targetfile);
+ size_t fileind = 0;
+ std::vector<std::string> targetfiles;
+ while (fileind + 2 <= CmdL.FileSize())
+ {
+ std::string download_uri = CmdL.FileList[fileind + 1];
+ std::string targetfile = CmdL.FileList[fileind + 2];
+ std::string hash;
+ if (CmdL.FileSize() > fileind + 3)
+ hash = CmdL.FileList[fileind + 3];
+ // we use download_uri as descr and targetfile as short-descr
+ new pkgAcqFile(&Fetcher, download_uri, hash, 0, download_uri, targetfile,
+ "dest-dir-ignored", targetfile);
+ targetfiles.push_back(targetfile);
+ fileind += 3;
+ }
// Disable drop-privs if "_apt" can not write to the target dir
CheckDropPrivsMustBeDisabled(Fetcher);
bool Failed = false;
- if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true ||
- FileExists(targetfile) == false)
+ if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true)
return _error->Error(_("Download Failed"));
+ if (targetfiles.empty() == false)
+ for (std::vector<std::string>::const_iterator f = targetfiles.begin(); f != targetfiles.end(); ++f)
+ if (FileExists(*f) == false)
+ return _error->Error(_("Download Failed"));
+
return true;
}
static bool ShowHelp(CommandLine &)
{
- ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
- COMMON_ARCH,__DATE__,__TIME__);
+ ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
if (_config->FindB("version") == true)
return true;
@@ -108,25 +118,8 @@ int main(int argc,const char *argv[]) /*{{{*/
textdomain(PACKAGE);
// Parse the command line and initialize the package library
- CommandLine CmdL(Args.data(),_config);
- if (pkgInitConfig(*_config) == false ||
- CmdL.Parse(argc,argv) == false ||
- pkgInitSystem(*_config,_system) == false)
- {
- if (_config->FindB("version") == true)
- ShowHelp(CmdL);
- _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;
- }
+ CommandLine CmdL;
+ ParseCommandLine(CmdL, Cmds, Args.data(), &_config, &_system, argc, argv, ShowHelp);
InitOutput();
diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index 92a4429e5..939061b93 100644
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -24,7 +24,9 @@
#include <apt-pkg/depcache.h>
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/cacheiterators.h>
+
#include <apt-private/private-output.h>
+#include <apt-private/private-cmndline.h>
#include <string.h>
#include <iostream>
@@ -42,8 +44,7 @@
// ---------------------------------------------------------------------
/* */
static bool ShowHelp(CommandLine &) {
- ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
- COMMON_ARCH,__DATE__,__TIME__);
+ ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
std::cout <<
_("Usage: apt-internal-solver\n"
@@ -79,19 +80,8 @@ int main(int argc,const char *argv[]) /*{{{*/
// we really don't need anything
DropPrivileges();
- CommandLine CmdL(Args,_config);
- if (pkgInitConfig(*_config) == false ||
- CmdL.Parse(argc,argv) == false) {
- _error->DumpErrors();
- return 2;
- }
-
- // See if the help should be shown
- if (_config->FindB("help") == true ||
- _config->FindB("version") == true) {
- ShowHelp(CmdL);
- return 1;
- }
+ CommandLine CmdL;
+ ParseCommandLine(CmdL, NULL, Args, &_config, NULL, argc, argv, ShowHelp);
if (CmdL.FileList[0] != 0 && strcmp(CmdL.FileList[0], "scenario") == 0)
{
diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index cf0b9a96f..2a66ad74d 100644
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -168,7 +168,7 @@ remove_key_from_keyring() {
local GPG="$GPG_CMD --keyring $KEYRINGFILE"
for KEY in "$@"; do
# check if the key is in this keyring: the key id is in the 5 column at the end
- if ! get_fingerprints_of_keyring "$KEYRINGFILE" | grep -q "^[0-9A-F]*${KEY}$"; then
+ if ! get_fingerprints_of_keyring "$KEYRINGFILE" | grep -iq "^[0-9A-F]*${KEY}$"; then
continue
fi
if [ ! -w "$KEYRINGFILE" ]; then
diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index ed348358a..de1c80309 100644
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -22,6 +22,7 @@
#include <apt-pkg/pkgcache.h>
#include <apt-private/private-cmndline.h>
+#include <apt-private/private-output.h>
#include <errno.h>
#include <fcntl.h>
@@ -41,10 +42,6 @@
/*}}}*/
using namespace std;
-ostream c0out(0);
-ostream c1out(0);
-ostream c2out(0);
-ofstream devnull("/dev/null");
/* DoAuto - mark packages as automatically/manually installed {{{*/
static bool DoAuto(CommandLine &CmdL)
{
@@ -277,6 +274,70 @@ static bool DoHold(CommandLine &CmdL)
return true;
}
+ APT::PackageList keepoffset;
+ for (APT::PackageList::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg)
+ {
+ if (Pkg->CurrentVer != 0)
+ continue;
+ keepoffset.insert(*Pkg);
+ }
+
+ if (keepoffset.empty() == false)
+ {
+ Args.erase(Args.begin() + BaseArgs, Args.end());
+ Args.push_back("--merge-avail");
+ // FIXME: supported only since 1.17.7 in dpkg
+ Args.push_back("-");
+ Args.push_back(NULL);
+
+ int external[2] = {-1, -1};
+ if (pipe(external) != 0)
+ return _error->WarningE("DoHold", "Can't create IPC pipe for dpkg --merge-avail");
+
+ pid_t dpkgMergeAvail = ExecFork();
+ if (dpkgMergeAvail == 0)
+ {
+ close(external[1]);
+ std::string const chrootDir = _config->FindDir("DPkg::Chroot-Directory");
+ if (chrootDir != "/" && chroot(chrootDir.c_str()) != 0 && chdir("/") != 0)
+ _error->WarningE("getArchitecture", "Couldn't chroot into %s for dpkg --merge-avail", chrootDir.c_str());
+ dup2(external[0], STDIN_FILENO);
+ int const nullfd = open("/dev/null", O_RDONLY);
+ dup2(nullfd, STDOUT_FILENO);
+ execvp(Args[0], (char**) &Args[0]);
+ _error->WarningE("dpkgGo", "Can't get dpkg --merge-avail running!");
+ _exit(2);
+ }
+
+ FILE* dpkg = fdopen(external[1], "w");
+ for (APT::PackageList::iterator Pkg = keepoffset.begin(); Pkg != keepoffset.end(); ++Pkg)
+ {
+ char const * Arch;
+ if (Pkg->VersionList != 0)
+ Arch = Pkg.VersionList().Arch();
+ else
+ Arch = Pkg.Arch();
+ fprintf(dpkg, "Package: %s\nVersion: 0~\nArchitecture: %s\nMaintainer: Dummy Example <dummy@example.org>\n"
+ "Description: dummy package record\n A record is needed to put a package on hold, so here it is.\n\n", Pkg.Name(), Arch);
+ }
+ fclose(dpkg);
+ keepoffset.clear();
+
+ if (dpkgMergeAvail > 0)
+ {
+ int Status = 0;
+ while (waitpid(dpkgMergeAvail, &Status, 0) != dpkgMergeAvail)
+ {
+ if (errno == EINTR)
+ continue;
+ _error->WarningE("dpkgGo", _("Waited for %s but it wasn't there"), "dpkg --merge-avail");
+ break;
+ }
+ if (WIFEXITED(Status) == false || WEXITSTATUS(Status) != 0)
+ return _error->Error(_("Executing dpkg failed. Are you root?"));
+ }
+ }
+
Args.erase(Args.begin() + BaseArgs, Args.end());
Args.push_back("--set-selections");
Args.push_back(NULL);
@@ -292,12 +353,9 @@ static bool DoHold(CommandLine &CmdL)
std::string const chrootDir = _config->FindDir("DPkg::Chroot-Directory");
if (chrootDir != "/" && chroot(chrootDir.c_str()) != 0 && chdir("/") != 0)
_error->WarningE("getArchitecture", "Couldn't chroot into %s for dpkg --set-selections", chrootDir.c_str());
- int const nullfd = open("/dev/null", O_RDONLY);
dup2(external[0], STDIN_FILENO);
- dup2(nullfd, STDOUT_FILENO);
- dup2(nullfd, STDERR_FILENO);
execvp(Args[0], (char**) &Args[0]);
- _error->WarningE("dpkgGo", "Can't detect if dpkg supports multi-arch!");
+ _error->WarningE("dpkgGo", "Can't get dpkg --set-selections running!");
_exit(2);
}
@@ -385,8 +443,7 @@ static bool ShowHold(CommandLine &CmdL)
/* */
static bool ShowHelp(CommandLine &)
{
- ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
- COMMON_ARCH,__DATE__,__TIME__);
+ ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
cout <<
_("Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -441,39 +498,10 @@ int main(int argc,const char *argv[]) /*{{{*/
setlocale(LC_ALL,"");
textdomain(PACKAGE);
- // Parse the command line and initialize the package library
- CommandLine CmdL(Args.data(),_config);
- if (pkgInitConfig(*_config) == false ||
- CmdL.Parse(argc,argv) == false ||
- pkgInitSystem(*_config,_system) == false)
- {
- if (_config->FindB("version") == true)
- ShowHelp(CmdL);
- _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;
- }
-
- // Deal with stdout not being a tty
- if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
- _config->Set("quiet","1");
+ CommandLine CmdL;
+ ParseCommandLine(CmdL, Cmds, Args.data(), &_config, &_system, argc, argv, ShowHelp);
- // Setup the output streams
- c0out.rdbuf(cout.rdbuf());
- c1out.rdbuf(cout.rdbuf());
- c2out.rdbuf(cout.rdbuf());
- if (_config->FindI("quiet",0) > 0)
- c0out.rdbuf(devnull.rdbuf());
- if (_config->FindI("quiet",0) > 1)
- c1out.rdbuf(devnull.rdbuf());
+ InitOutput();
// Match the operation
CmdL.DispatchArg(Cmds);
diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index c2b11890a..12ef8dda0 100644
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -23,6 +23,8 @@
#include <apt-pkg/fileutl.h>
#include <apt-pkg/pkgsystem.h>
+#include <apt-private/private-cmndline.h>
+
#include <vector>
#include <algorithm>
#include <stdio.h>
@@ -106,8 +108,10 @@ static bool DoIt(string InFile)
const char **Order = TFRewritePackageOrder;
if (Source == true)
Order = TFRewriteSourceOrder;
-
+
// Emit
+ FileFd stdoutfd;
+ stdoutfd.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly, false);
unsigned char *Buffer = new unsigned char[Largest+1];
for (vector<PkgName>::iterator I = List.begin(); I != List.end(); ++I)
{
@@ -117,8 +121,8 @@ static bool DoIt(string InFile)
delete [] Buffer;
return false;
}
-
- Buffer[I->Length] = '\n';
+
+ Buffer[I->Length] = '\n';
if (Section.Scan((char *)Buffer,I->Length+1) == false)
{
delete [] Buffer;
@@ -126,15 +130,13 @@ static bool DoIt(string InFile)
}
// Sort the section
- if (TFRewrite(stdout,Section,Order,0) == false)
+ if (Section.Write(stdoutfd, Order) == false || stdoutfd.Write("\n", 1) == false)
{
delete [] Buffer;
return _error->Error("Internal error, failed to sort fields");
}
-
- fputc('\n',stdout);
}
-
+
delete [] Buffer;
return true;
}
@@ -142,12 +144,11 @@ static bool DoIt(string InFile)
// ShowHelp - Show the help text /*{{{*/
// ---------------------------------------------------------------------
/* */
-static int ShowHelp()
+static bool ShowHelp(CommandLine &)
{
- ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
- COMMON_ARCH,__DATE__,__TIME__);
+ ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
if (_config->FindB("version") == true)
- return 0;
+ return true;
cout <<
_("Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
@@ -161,7 +162,7 @@ static int ShowHelp()
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");
- return 0;
+ return true;
}
/*}}}*/
int main(int argc,const char *argv[]) /*{{{*/
@@ -179,19 +180,9 @@ int main(int argc,const char *argv[]) /*{{{*/
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();
+ CommandLine::Dispatch Cmds[] = {{NULL, NULL}};
+ CommandLine CmdL;
+ ParseCommandLine(CmdL, Cmds, Args, &_config, &_system, argc, argv, ShowHelp);
// Match the operation
for (unsigned int I = 0; I != CmdL.FileSize(); I++)
diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 2cfdf8e8e..2f7eddb61 100644
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -39,8 +39,7 @@
static bool ShowHelp(CommandLine &)
{
- ioprintf(c1out,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
- COMMON_ARCH,__DATE__,__TIME__);
+ ioprintf(c1out, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
// FIXME: generate from CommandLine
c1out <<
@@ -119,15 +118,10 @@ int main(int argc, const char *argv[]) /*{{{*/
_config->CndSet("APT::Cmd::Show-Update-Stats", true);
// Parse the command line and initialize the package library
- CommandLine CmdL(Args.data(), _config);
- if (CmdL.Parse(argc, argv) == false ||
- pkgInitSystem(*_config, _system) == false)
- {
- _error->DumpErrors();
- return 100;
- }
+ CommandLine CmdL;
+ ParseCommandLine(CmdL, Cmds, Args.data(), NULL, &_system, argc, argv, ShowHelp);
- if(!isatty(STDOUT_FILENO) &&
+ if(!isatty(STDOUT_FILENO) &&
_config->FindB("Apt::Cmd::Disable-Script-Warning", false) == false)
{
std::cerr << std::endl
@@ -138,15 +132,6 @@ int main(int argc, const char *argv[]) /*{{{*/
<< std::endl;
}
- // See if the help should be shown
- if (_config->FindB("help") == true ||
- _config->FindB("version") == true ||
- CmdL.FileSize() == 0)
- {
- ShowHelp(CmdL);
- return 0;
- }
-
// see if we are in simulate mode
CheckSimulateMode(CmdL);
diff --git a/cmdline/makefile b/cmdline/makefile
index b7c35ddd1..816038c3b 100644
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -67,15 +67,15 @@ APT_DOMAIN:=apt-utils
# The apt-sortpkgs program
PROGRAM=apt-sortpkgs
-SLIBS = -lapt-pkg $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile
+SLIBS = -lapt-pkg -lapt-private $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile apt-private/makefile
SOURCE = apt-sortpkgs.cc
include $(PROGRAM_H)
# The apt-extracttemplates program
PROGRAM=apt-extracttemplates
-SLIBS = -lapt-pkg -lapt-inst $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile apt-inst/makefile
+SLIBS = -lapt-pkg -lapt-inst -lapt-private $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile apt-inst/makefile apt-private/makefile
SOURCE = apt-extracttemplates.cc
include $(PROGRAM_H)
diff --git a/configure.ac b/configure.ac
index 4647a1118..2221833a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
PACKAGE="apt"
-PACKAGE_VERSION="1.1~exp7"
+PACKAGE_VERSION="1.0.9.8"
PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
@@ -91,7 +91,7 @@ AC_CHECK_LIB(curl, curl_easy_init,
AC_LANG_PUSH([C++])
AC_CHECK_HEADER(gtest/gtest.h,,
- AC_MSG_ERROR([failed: I need gtest to build tests]),
+ AC_MSG_WARN([failed: I need gtest (packaged as libgtest-dev) for unit testing]),
)
AC_LANG_POP([C++])
diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh
index c00416127..807c6f745 100644
--- a/debian/apt.auto-removal.sh
+++ b/debian/apt.auto-removal.sh
@@ -41,7 +41,7 @@ version_test_gt ()
return "$?"
}
-list="$(${DPKG} -l | awk '/^ii[ ]+(linux|kfreebsd|gnumach)-image-[0-9]/ && $2 !~ /-dbg$/ { print $2 }' | sed -e 's#\(linux\|kfreebsd\|gnumach\)-image-##')"
+list="$(${DPKG} -l | awk '/^ii[ ]+(linux|kfreebsd|gnumach)-image-[0-9]+\./ && $2 !~ /-dbg$/ { print $2 }' | sed -e 's#\(linux\|kfreebsd\|gnumach\)-image-##')"
latest_version=""
previous_version=""
diff --git a/debian/changelog b/debian/changelog
index 246c0be40..7414b5c61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -234,6 +234,121 @@ apt (1.1~exp1) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 19 Jun 2014 12:01:48 +0200
+apt (1.0.9.9) unstable; urgency=medium
+
+ [ David Kalnischkies ]
+ * parse specific-arch dependencies correctly on single-arch systems
+ (Closes: 777760)
+ * remove "first package seen is native package" assumption.
+ Thanks to Axel Beckert for testing (Closes: 782777)
+
+ -- David Kalnischkies <david@kalnischkies.de> Tue, 28 Apr 2015 16:11:27 +0200
+
+apt (1.0.9.8) unstable; urgency=medium
+
+ [ David Kalnischkies ]
+ * fix another d(e)select-upgrade typo (LP: #1399037)
+ * properly handle expected filesize in https.
+ Thanks to Robert Edmonds and Anders Kaseorg for initial patchs
+ (Closes: 777565, 781509) (LP: #807303)
+ * avoid depends on std::string implementation for pkgAcquire::Item::Mode
+ (Closes: 781858)
+ * demote VectorizeString gcc attribute from const to pure
+ * keyids in "apt-key del" should be case-insensitive (Closes: 781696)
+ * parse specific-arch dependencies correctly on single-arch systems
+ (Closes: 777760)
+
+ [ Michael Vogt ]
+ * fix crash in order writing in pkgDPkgPM::WriteApportReport() (LP: #1436626)
+
+ -- David Kalnischkies <david@kalnischkies.de> Mon, 13 Apr 2015 07:14:36 +0200
+
+apt (1.0.9.7) unstable; urgency=medium
+
+ [ Tomasz Buchert ]
+ * Fix crash in the apt-transport-https when Owner is NULL (Closes: #778375)
+
+ -- Michael Vogt <mvo@debian.org> Mon, 23 Feb 2015 12:54:03 +0100
+
+apt (1.0.9.6) unstable; urgency=medium
+
+ [ Michael Vogt ]
+ * Fix missing URIStart() for https downloads
+ * Add regression test for the previous commit
+
+ [ David Kalnischkies ]
+ * 128 KiB DSC files ought to be enough for everyone (Closes: 774893)
+ * award points for positive dependencies again (Closes: 774924)
+
+ -- Michael Vogt <mvo@ubuntu.com> Fri, 16 Jan 2015 08:37:25 +0100
+
+apt (1.0.9.5) unstable; urgency=medium
+
+ [ David Kalnischkies ]
+ * dispose http(s) 416 error page as non-content (Closes: 768797)
+ * do not make PTY slave the controlling terminal (Closes: 772641)
+ * always run 'dpkg --configure -a' at the end of our dpkg callings
+ (Closes: 769609)
+ * pass-through stdin fd instead of content if not a terminal (Closes: 773061)
+
+ [ James McCoy ]
+ * tighten filtering of kernel images in apt.auto-removal (Closes: 772732)
+
+ [ Jean-Pierre Giraud ]
+ * French manpages translation update (Closes: 771967)
+
+ [ Zhou Mo ]
+ * Chinese (simplified) program translation update (Closes: 771982)
+
+ [ Kenshi Muto ]
+ * Japanese program translation update (Closes: 772678)
+
+ [ Theppitak Karoonboonyanan ]
+ * Thai program translation update (Closes: 772913)
+
+ -- David Kalnischkies <david@kalnischkies.de> Tue, 23 Dec 2014 13:22:42 +0100
+
+apt (1.0.9.4) unstable; urgency=medium
+
+ [ David Kalnischkies ]
+ * use 'best' hash for source authentication (LP: 1098738)
+ * deprecate the Section member from package struct
+ * allow options between command and -- on commandline
+ * re-enable support for -s (and co) in apt-get source (Closes: 742578)
+ * change codenames to jessie as stable POV in docs
+ * close leaking slave fd after setting up pty magic (Closes: 767774)
+ * fix PTY interaction on linux and kfreebsd (Closes: 765687)
+
+ [ James McCoy ]
+ * support long keyids in "apt-key del" instead of ignoring them
+ (Closes: 754436)
+
+ [ Michael Vogt ]
+ * Use sysconf(_SC_ARG_MAX) to find the size of Dpkg::MaxArgBytes
+
+ [ Frans Spiesschaert ]
+ * Dutch program translation update (Closes: 771039)
+
+ [ Julien Patriarca ]
+ * French program translation update (Closes: 766755)
+
+ [ Zhou Mo ]
+ * Chinese (simplified) program translation update (Closes: 766170)
+
+ [ Miroslav Kure ]
+ * Czech program translation update (Closes: 764055)
+
+ [ Mert Dirik ]
+ * Turkish program translation update (Closes: 763379)
+
+ [ Kenshi Muto ]
+ * Japanese program translation update (Closes: 763033)
+
+ [ Manuel "Venturi" Porras Peralta ]
+ * Spanish program translation update (Closes: 771815)
+
+ -- David Kalnischkies <david@kalnischkies.de> Wed, 03 Dec 2014 14:26:04 +0100
+
apt (1.0.9.3) unstable; urgency=medium
[ josch ]
diff --git a/debian/libapt-pkg4.15.symbols b/debian/libapt-pkg4.15.symbols
index 90f67b5cd..ee7f7a66e 100644
--- a/debian/libapt-pkg4.15.symbols
+++ b/debian/libapt-pkg4.15.symbols
@@ -49,6 +49,8 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"pkgPrioSortList(pkgCache&, pkgCache::Version**)@Base" 0.8.0
(c++)"pkgMakeStatusCache(pkgSourceList&, OpProgress&, MMap**, bool)@Base" 0.8.0
(c++)"pkgMinimizeUpgrade(pkgDepCache&)@Base" 0.8.0
+ (c++)"pkgAllUpgrade(pkgDepCache&)@Base" 0.8.0
+ (c++)"pkgDistUpgrade(pkgDepCache&)@Base" 0.8.0
(c++)"GetListOfFilesInDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, bool const&)@Base" 0.8.0
(c++)"GetListOfFilesInDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool const&, bool const&)@Base" 0.8.0
(c++)"pkgMakeOnlyStatusCache(OpProgress&, DynamicMMap**)@Base" 0.8.0
@@ -76,13 +78,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"stringcmp(__gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >)@Base" 0.8.0
(c++)"stringcmp(char const*, char const*, char const*, char const*)@Base" 0.8.0
(c++)"strprintf(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, char const*, ...)@Base" 0.8.0
- (c++)"guard variable for pkgCacheGenerator::Dynamic<pkgCache::DepIterator>::toReMap@Base" 0.8.0
- (c++)"guard variable for pkgCacheGenerator::Dynamic<pkgCache::GrpIterator>::toReMap@Base" 0.8.0
- (c++)"guard variable for pkgCacheGenerator::Dynamic<pkgCache::PkgIterator>::toReMap@Base" 0.8.0
- (c++)"guard variable for pkgCacheGenerator::Dynamic<pkgCache::PrvIterator>::toReMap@Base" 0.8.0
- (c++)"guard variable for pkgCacheGenerator::Dynamic<pkgCache::VerIterator>::toReMap@Base" 0.8.0
- (c++)"guard variable for pkgCacheGenerator::Dynamic<pkgCache::DescIterator>::toReMap@Base" 0.8.0
- (c++)"guard variable for pkgCacheGenerator::Dynamic<pkgCache::PkgFileIterator>::toReMap@Base" 0.8.0
(c++)"HashString::SupportedHashes()@Base" 0.8.0
(c++)"HashString::_SupportedHashes@Base" 0.8.0
(c++)"HashString::HashString(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
@@ -207,9 +202,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"PackageCopy::RewriteEntry(_IO_FILE*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
(c++)"PackageCopy::Type()@Base" 0.8.0
(c++)"PackageCopy::~PackageCopy()@Base" 0.8.0
- (c++)"pkgAcqIndex::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
- (c++)"pkgAcqIndex::DescURI()@Base" 0.8.0
- (c++)"pkgAcqIndex::~pkgAcqIndex()@Base" 0.8.0
(c++)"pkgDepCache::IsDeleteOk(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.8.0
(c++)"pkgDepCache::MarkDelete(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.8.0
(c++)"pkgDepCache::StateCache::StripEpoch(char const*)@Base" 0.8.0
@@ -243,6 +235,8 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"pkgDepCache::CheckDep(pkgCache::DepIterator, int, pkgCache::PkgIterator&)@Base" 0.8.0
(c++)"pkgDepCache::MarkAuto(pkgCache::PkgIterator const&, bool)@Base" 0.8.0
(c++)"pkgDepCache::MarkKeep(pkgCache::PkgIterator const&, bool, bool, unsigned long)@Base" 0.8.0
+ (c++)"pkgDepCache::MarkRequired(pkgDepCache::InRootSetFunc&)@Base" 0.8.0
+ (c++)"pkgDepCache::Sweep()@Base" 0.8.0
(c++)"pkgDepCache::pkgDepCache(pkgCache*, pkgDepCache::Policy*)@Base" 0.8.0
(c++)"pkgDepCache::~pkgDepCache()@Base" 0.8.0
(c++)"pkgSimulate::Policy::GetCandidateVer(pkgCache::PkgIterator const&)@Base" 0.8.0
@@ -252,9 +246,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"pkgSimulate::Configure(pkgCache::PkgIterator)@Base" 0.8.0
(c++)"pkgSimulate::pkgSimulate(pkgDepCache*)@Base" 0.8.0
(c++)"pkgSimulate::~pkgSimulate()@Base" 0.8.0
- (c++)"debIFTypePkg::~debIFTypePkg()@Base" 0.8.0
- (c++)"debIFTypeSrc::~debIFTypeSrc()@Base" 0.8.0
- (c++)"debSLTypeDeb::~debSLTypeDeb()@Base" 0.8.0
(c++)"indexRecords::Load(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
(c++)"indexRecords::Lookup(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
(c++)"indexRecords::MetaKeys()@Base" 0.8.0
@@ -330,27 +321,9 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"Configuration::Configuration()@Base" 0.8.0
(c++)"Configuration::~Configuration()@Base" 0.8.0
(c++)"WeakPointable::~WeakPointable()@Base" 0.8.0
- (c++)"debListParser::NewVersion(pkgCache::VerIterator&)@Base" 0.8.0
- (c++)"debListParser::UsePackage(pkgCache::PkgIterator&, pkgCache::VerIterator&)@Base" 0.8.0
- (c++)"debListParser::ParseStatus(pkgCache::PkgIterator&, pkgCache::VerIterator&)@Base" 0.8.0
- (c++)"debListParser::VersionHash()@Base" 0.8.0
- (c++)"debListParser::Architecture()@Base" 0.8.0
(c++)"debListParser::ParseDepends(char const*, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&, bool const&, bool const&)@Base" 0.8.0
- (c++)"debListParser::ParseDepends(pkgCache::VerIterator&, char const*, unsigned int)@Base" 0.8.0
- (c++)"debListParser::ParseProvides(pkgCache::VerIterator&)@Base" 0.8.0
- (c++)"debListParser::ArchitectureAll()@Base" 0.8.0
(c++)"debListParser::ConvertRelation(char const*, unsigned int&)@Base" 0.8.0
- (c++)"debListParser::Description_md5()@Base" 0.8.0
- (c++)"debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator&, FileFd&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"debListParser::Size()@Base" 0.8.0
- (c++)"debListParser::Step()@Base" 0.8.0
- (c++)"debListParser::Offset()@Base" 0.8.0
(c++)"debListParser::GetPrio(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"debListParser::Package()@Base" 0.8.0
- (c++)"debListParser::Version()@Base" 0.8.0
- (c++)"debListParser::GrabWord(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, debListParser::WordList*, unsigned char&)@Base" 0.8.0
- (c++)"debListParser::debListParser(FileFd*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
- (c++)"debListParser::~debListParser()@Base" 0.8.0
(c++)"pkgAcqArchive::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
(c++)"pkgAcqArchive::DescURI()@Base" 0.8.0
(c++)"pkgAcqArchive::Finished()@Base" 0.8.0
@@ -358,9 +331,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"pkgAcqArchive::ShortDesc()@Base" 0.8.0
(c++)"pkgAcqArchive::pkgAcqArchive(pkgAcquire*, pkgSourceList*, pkgRecords*, pkgCache::VerIterator const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 0.8.0
(c++)"pkgAcqArchive::~pkgAcqArchive()@Base" 0.8.0
- (c++)"pkgAcqMetaSig::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
- (c++)"pkgAcqMetaSig::DescURI()@Base" 0.8.0
- (c++)"pkgAcqMetaSig::~pkgAcqMetaSig()@Base" 0.8.0
(c++)"pkgSourceList::ReadAppend(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
(c++)"pkgSourceList::ReadMainList()@Base" 0.8.0
(c++)"pkgSourceList::ReadSourceDir(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
@@ -393,38 +363,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"OpTextProgress::Update()@Base" 0.8.0
(c++)"OpTextProgress::OpTextProgress(Configuration&)@Base" 0.8.0
(c++)"OpTextProgress::~OpTextProgress()@Base" 0.8.0
- (c++)"debIFTypeTrans::~debIFTypeTrans()@Base" 0.8.0
- (c++)"debStatusIndex::debStatusIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"debStatusIndex::~debStatusIndex()@Base" 0.8.0
- (c++)"debIFTypeStatus::~debIFTypeStatus()@Base" 0.8.0
- (c++)"debRecordParser::Maintainer()@Base" 0.8.0
- (c++)"debRecordParser::Jump(pkgCache::VerFileIterator const&)@Base" 0.8.0
- (c++)"debRecordParser::Jump(pkgCache::DescFileIterator const&)@Base" 0.8.0
- (c++)"debRecordParser::Name()@Base" 0.8.0
- (c++)"debRecordParser::GetRec(char const*&, char const*&)@Base" 0.8.0
- (c++)"debRecordParser::FileName()@Base" 0.8.0
- (c++)"debRecordParser::Homepage()@Base" 0.8.0
- (c++)"debRecordParser::SourcePkg()@Base" 0.8.0
- (c++)"debRecordParser::SourceVer()@Base" 0.8.0
- (c++)"debRecordParser::debRecordParser(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgCache&)@Base" 0.8.0
- (c++)"debRecordParser::~debRecordParser()@Base" 0.8.0
- (c++)"debReleaseIndex::GetIndexFiles()@Base" 0.8.0
- (c++)"debReleaseIndex::debSectionEntry::debSectionEntry(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool const&)@Base" 0.8.0
- (c++)"debReleaseIndex::PushSectionEntry(debReleaseIndex::debSectionEntry const*)@Base" 0.8.0
- (c++)"debReleaseIndex::PushSectionEntry(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, debReleaseIndex::debSectionEntry const*)@Base" 0.8.0
- (c++)"debReleaseIndex::PushSectionEntry(std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, debReleaseIndex::debSectionEntry const*)@Base" 0.8.0
- (c++)"debReleaseIndex::debReleaseIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
- (c++)"debReleaseIndex::~debReleaseIndex()@Base" 0.8.0
- (c++)"debSLTypeDebSrc::~debSLTypeDebSrc()@Base" 0.8.0
- (c++)"debSourcesIndex::debSourcesIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, bool)@Base" 0.8.0
- (c++)"debSourcesIndex::~debSourcesIndex()@Base" 0.8.0
- (c++)"pkgAcqDiffIndex::ParseDiffIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
- (c++)"pkgAcqDiffIndex::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
- (c++)"pkgAcqDiffIndex::DescURI()@Base" 0.8.0
- (c++)"pkgAcqDiffIndex::~pkgAcqDiffIndex()@Base" 0.8.0
- (c++)"pkgAcqMetaIndex::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
- (c++)"pkgAcqMetaIndex::DescURI()@Base" 0.8.0
- (c++)"pkgAcqMetaIndex::~pkgAcqMetaIndex()@Base" 0.8.0
(c++)"pkgVersionMatch::ExpressionMatches(char const*, char const*)@Base" 0.8.0
(c++)"pkgVersionMatch::ExpressionMatches(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*)@Base" 0.8.0
(c++)"pkgVersionMatch::Find(pkgCache::PkgIterator)@Base" 0.8.0
@@ -433,11 +371,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"pkgVersionMatch::pkgVersionMatch(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgVersionMatch::MatchType)@Base" 0.8.0
(c++)"pkgVersionMatch::~pkgVersionMatch()@Base" 0.8.0
(c++)"TranslationsCopy::CopyTranslations(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, pkgCdromStatus*)@Base" 0.8.0
- (c++)"debPackagesIndex::debPackagesIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
- (c++)"debPackagesIndex::~debPackagesIndex()@Base" 0.8.0
- (c++)"pkgAcqIndexDiffs::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.0
- (c++)"pkgAcqIndexDiffs::DescURI()@Base" 0.8.0
- (c++)"pkgAcqIndexDiffs::~pkgAcqIndexDiffs()@Base" 0.8.0
(c++)"pkgAcquireStatus::Done(pkgAcquire::ItemDesc&)@Base" 0.8.0
(c++)"pkgAcquireStatus::Fail(pkgAcquire::ItemDesc&)@Base" 0.8.0
(c++)"pkgAcquireStatus::Stop()@Base" 0.8.0
@@ -448,30 +381,9 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"pkgAcquireStatus::pkgAcquireStatus()@Base" 0.8.0
(c++)"PreferenceSection::TrimRecord(bool, char const*&)@Base" 0.8.0
(c++)"pkgArchiveCleaner::Go(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgCache&)@Base" 0.8.0
- (c++)"pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int, unsigned int)@Base" 0.8.0
- (c++)"pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
- (c++)"pkgCacheGenerator::ListParser::CollectFileProvides(pkgCache&, pkgCache::VerIterator&)@Base" 0.8.0
- (c++)"pkgCacheGenerator::NewFileVer(pkgCache::VerIterator&, pkgCacheGenerator::ListParser&)@Base" 0.8.0
- (c++)"pkgCacheGenerator::NewPackage(pkgCache::PkgIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
- (c++)"pkgCacheGenerator::SelectFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, pkgIndexFile const&, unsigned long)@Base" 0.8.0
- (c++)"pkgCacheGenerator::FinishCache(OpProgress*)@Base" 0.8.0
- (c++)"pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator&, pkgCacheGenerator::ListParser&)@Base" 0.8.0
(c++)"pkgCacheGenerator::MakeStatusCache(pkgSourceList&, OpProgress*, MMap**, bool)@Base" 0.8.0
(c++)"pkgCacheGenerator::CreateDynamicMMap(FileFd*, unsigned long)@Base" 0.8.0
- (c++)"pkgCacheGenerator::MergeFileProvides(pkgCacheGenerator::ListParser&)@Base" 0.8.0
(c++)"pkgCacheGenerator::MakeOnlyStatusCache(OpProgress*, DynamicMMap**)@Base" 0.8.0
- (c++)"pkgCacheGenerator::ReMap(void const*, void const*)@Base" 0.8.0
- (c++)"pkgCacheGenerator::Dynamic<pkgCache::DepIterator>::toReMap@Base" 0.8.0
- (c++)"pkgCacheGenerator::Dynamic<pkgCache::GrpIterator>::toReMap@Base" 0.8.0
- (c++)"pkgCacheGenerator::Dynamic<pkgCache::PkgIterator>::toReMap@Base" 0.8.0
- (c++)"pkgCacheGenerator::Dynamic<pkgCache::PrvIterator>::toReMap@Base" 0.8.0
- (c++)"pkgCacheGenerator::Dynamic<pkgCache::VerIterator>::toReMap@Base" 0.8.0
- (c++)"pkgCacheGenerator::Dynamic<pkgCache::DescIterator>::toReMap@Base" 0.8.0
- (c++)"pkgCacheGenerator::Dynamic<pkgCache::PkgFileIterator>::toReMap@Base" 0.8.0
- (c++)"pkgCacheGenerator::NewGroup(pkgCache::GrpIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
- (c++)"pkgCacheGenerator::MergeList(pkgCacheGenerator::ListParser&, pkgCache::VerIterator*)@Base" 0.8.0
- (c++)"pkgCacheGenerator::pkgCacheGenerator(DynamicMMap*, OpProgress*)@Base" 0.8.0
- (c++)"pkgCacheGenerator::~pkgCacheGenerator()@Base" 0.8.0
(c++)"pkgPackageManager::FixMissing()@Base" 0.8.0
(c++)"pkgPackageManager::EarlyRemove(pkgCache::PkgIterator)@Base" 0.8.0
(c++)"pkgPackageManager::GetArchives(pkgAcquire*, pkgSourceList*, pkgRecords*)@Base" 0.8.0
@@ -492,15 +404,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"pkgPackageManager::DoInstall(int)@Base" 0.8.0
(c++)"pkgPackageManager::pkgPackageManager(pkgDepCache*)@Base" 0.8.0
(c++)"pkgPackageManager::~pkgPackageManager()@Base" 0.8.0
- (c++)"debSrcRecordParser::BuildDepends(std::vector<pkgSrcRecords::Parser::BuildDepRec, std::allocator<pkgSrcRecords::Parser::BuildDepRec> >&, bool const&, bool const&)@Base" 0.8.0
- (c++)"debSrcRecordParser::Jump(unsigned long const&)@Base" 0.8.0
- (c++)"debSrcRecordParser::Step()@Base" 0.8.0
- (c++)"debSrcRecordParser::AsStr()@Base" 0.8.0
- (c++)"debSrcRecordParser::Files(std::vector<pkgSrcRecords::File, std::allocator<pkgSrcRecords::File> >&)@Base" 0.8.0
- (c++)"debSrcRecordParser::Offset()@Base" 0.8.0
- (c++)"debSrcRecordParser::Restart()@Base" 0.8.0
- (c++)"debSrcRecordParser::Binaries()@Base" 0.8.0
- (c++)"debSrcRecordParser::~debSrcRecordParser()@Base" 0.8.0
(c++)"pkgProblemResolver::InstallProtect()@Base" 0.8.0
(c++)"pkgProblemResolver::This@Base" 0.8.0
(c++)"pkgProblemResolver::pkgProblemResolver(pkgDepCache*)@Base" 0.8.0
@@ -521,8 +424,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"pkgVersioningSystem::TestCompatibility(pkgVersioningSystem const&)@Base" 0.8.0
(c++)"pkgVersioningSystem::GetVS(char const*)@Base" 0.8.0
(c++)"pkgVersioningSystem::pkgVersioningSystem()@Base" 0.8.0
- (c++)"debTranslationsIndex::debTranslationsIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, char const*)@Base" 0.8.0
- (c++)"debTranslationsIndex::~debTranslationsIndex()@Base" 0.8.0
(c++)"APT::CacheFilter::PackageNameMatchesRegEx::PackageNameMatchesRegEx(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.0
(c++)"APT::CacheFilter::PackageNameMatchesRegEx::~PackageNameMatchesRegEx()@Base" 0.8.0
(c++)"APT::CacheFilter::PackageNameMatchesRegEx::operator()(pkgCache::GrpIterator const&)@Base" 0.8.0
@@ -556,7 +457,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"Vendor::CheckDist(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.0
(c++)"Vendor::Vendor(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<Vendor::Fingerprint*, std::allocator<Vendor::Fingerprint*> >*)@Base" 0.8.0
(c++)"Vendor::~Vendor()@Base" 0.8.0
- (c++)"DiffInfo::~DiffInfo()@Base" 0.8.0
(c++)"pkgCache::CompTypeDeb(unsigned char)@Base" 0.8.0
(c++)"pkgCache::DepIterator::GlobOr(pkgCache::DepIterator&, pkgCache::DepIterator&)@Base" 0.8.0
(c++)"pkgCache::DepIterator::operator++(int)@Base" 0.8.0
@@ -648,8 +548,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"HashString::toStr() const@Base" 0.8.0
(c++)"CommandLine::FileSize() const@Base" 0.8.0
(c++)"GlobalError::empty(GlobalError::MsgType const&) const@Base" 0.8.0
- (c++)"debIFTypePkg::CreatePkgParser(pkgCache::PkgFileIterator) const@Base" 0.8.0
- (c++)"debSLTypeDeb::CreateItem(std::vector<metaIndex*, std::allocator<metaIndex*> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&) const@Base" 0.8.0
(c++)"indexRecords::GetValidUntil() const@Base" 0.8.0
(c++)"indexRecords::GetExpectedDist() const@Base" 0.8.0
(c++)"indexRecords::Exists(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.0
@@ -660,10 +558,8 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"pkgIndexFile::ArchiveInfo(pkgCache::VerIterator) const@Base" 0.8.0
(c++)"pkgIndexFile::FindInCache(pkgCache&) const@Base" 0.8.0
(c++)"pkgIndexFile::CreateSrcParser() const@Base" 0.8.0
- (c++)"pkgIndexFile::MergeFileProvides(pkgCacheGenerator&, OpProgress*) const@Base" 0.8.0
(c++)"pkgIndexFile::MergeFileProvides(pkgCacheGenerator&, OpProgress&) const@Base" 0.8.0
(c++)"pkgIndexFile::Type::CreatePkgParser(pkgCache::PkgFileIterator) const@Base" 0.8.0
- (c++)"pkgIndexFile::Merge(pkgCacheGenerator&, OpProgress*) const@Base" 0.8.0
(c++)"pkgIndexFile::Merge(pkgCacheGenerator&, OpProgress&) const@Base" 0.8.0
(c++)"Configuration::MatchAgainstConfig::Match(char const*) const@Base" 0.8.0
(c++)"Configuration::Find(char const*, char const*) const@Base" 0.8.0
@@ -685,56 +581,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"pkgTagSection::FindS(char const*) const@Base" 0.8.0
(c++)"pkgTagSection::FindULL(char const*, unsigned long long const&) const@Base" 0.8.0
(c++)"pkgTagSection::FindFlag(char const*, unsigned long&, unsigned long) const@Base" 0.8.0
- (c++)"debStatusIndex::FindInCache(pkgCache&) const@Base" 0.8.0
- (c++)"debStatusIndex::HasPackages() const@Base" 0.8.0
- (c++)"debStatusIndex::Size() const@Base" 0.8.0
- (c++)"debStatusIndex::Merge(pkgCacheGenerator&, OpProgress*) const@Base" 0.8.0
- (c++)"debStatusIndex::Exists() const@Base" 0.8.0
- (c++)"debStatusIndex::GetType() const@Base" 0.8.0
- (c++)"debStatusIndex::Describe(bool) const@Base" 0.8.0
- (c++)"debIFTypeStatus::CreatePkgParser(pkgCache::PkgFileIterator) const@Base" 0.8.0
- (c++)"debReleaseIndex::ArchiveURI(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.0
- (c++)"debReleaseIndex::GetIndexes(pkgAcquire*, bool const&) const@Base" 0.8.0
- (c++)"debReleaseIndex::MetaIndexURI(char const*) const@Base" 0.8.0
- (c++)"debReleaseIndex::MetaIndexFile(char const*) const@Base" 0.8.0
- (c++)"debReleaseIndex::MetaIndexInfo(char const*) const@Base" 0.8.0
- (c++)"debReleaseIndex::IndexURISuffix(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.0
- (c++)"debReleaseIndex::SourceIndexURI(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.0
- (c++)"debReleaseIndex::ComputeIndexTargets() const@Base" 0.8.0
- (c++)"debReleaseIndex::SourceIndexURISuffix(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.0
- (c++)"debReleaseIndex::Info(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.0
- (c++)"debReleaseIndex::IndexURI(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.0
- (c++)"debReleaseIndex::IsTrusted() const@Base" 0.8.0
- (c++)"debSLTypeDebSrc::CreateItem(std::vector<metaIndex*, std::allocator<metaIndex*> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&) const@Base" 0.8.0
- (c++)"debSLTypeDebian::CreateItemInternal(std::vector<metaIndex*, std::allocator<metaIndex*> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool const&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&) const@Base" 0.8.0
- (c++)"debSourcesIndex::ArchiveURI(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.8.0
- (c++)"debSourcesIndex::SourceInfo(pkgSrcRecords::Parser const&, pkgSrcRecords::File const&) const@Base" 0.8.0
- (c++)"debSourcesIndex::HasPackages() const@Base" 0.8.0
- (c++)"debSourcesIndex::CreateSrcParser() const@Base" 0.8.0
- (c++)"debSourcesIndex::Size() const@Base" 0.8.0
- (c++)"debSourcesIndex::Exists() const@Base" 0.8.0
- (c++)"debSourcesIndex::GetType() const@Base" 0.8.0
- (c++)"debSourcesIndex::Describe(bool) const@Base" 0.8.0
- (c++)"debPackagesIndex::ArchiveURI(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.8.0
- (c++)"debPackagesIndex::ArchiveInfo(pkgCache::VerIterator) const@Base" 0.8.0
- (c++)"debPackagesIndex::FindInCache(pkgCache&) const@Base" 0.8.0
- (c++)"debPackagesIndex::HasPackages() const@Base" 0.8.0
- (c++)"debPackagesIndex::Size() const@Base" 0.8.0
- (c++)"debPackagesIndex::Merge(pkgCacheGenerator&, OpProgress*) const@Base" 0.8.0
- (c++)"debPackagesIndex::Exists() const@Base" 0.8.0
- (c++)"debPackagesIndex::GetType() const@Base" 0.8.0
- (c++)"debPackagesIndex::Describe(bool) const@Base" 0.8.0
- (c++)"debSrcRecordParser::Maintainer() const@Base" 0.8.0
- (c++)"debSrcRecordParser::Package() const@Base" 0.8.0
- (c++)"debSrcRecordParser::Section() const@Base" 0.8.0
- (c++)"debSrcRecordParser::Version() const@Base" 0.8.0
- (c++)"debTranslationsIndex::FindInCache(pkgCache&) const@Base" 0.8.0
- (c++)"debTranslationsIndex::HasPackages() const@Base" 0.8.0
- (c++)"debTranslationsIndex::Size() const@Base" 0.8.0
- (c++)"debTranslationsIndex::Merge(pkgCacheGenerator&, OpProgress*) const@Base" 0.8.0
- (c++)"debTranslationsIndex::Exists() const@Base" 0.8.0
- (c++)"debTranslationsIndex::GetType() const@Base" 0.8.0
- (c++)"debTranslationsIndex::Describe(bool) const@Base" 0.8.0
(c++)"Vendor::GetVendorID() const@Base" 0.8.0
(c++)"Vendor::LookupFingerprint(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 0.8.0
(c++)"pkgCache::DepIterator::AllTargets() const@Base" 0.8.0
@@ -776,42 +622,22 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"typeinfo for pkgAcquire@Base" 0.8.0
(c++)"typeinfo for DynamicMMap@Base" 0.8.0
(c++)"typeinfo for PackageCopy@Base" 0.8.0
- (c++)"typeinfo for pkgAcqIndex@Base" 0.8.0
(c++)"typeinfo for pkgDepCache@Base" 0.8.0
(c++)"typeinfo for pkgSimulate@Base" 0.8.0
- (c++)"typeinfo for debIFTypePkg@Base" 0.8.0
- (c++)"typeinfo for debIFTypeSrc@Base" 0.8.0
- (c++)"typeinfo for debSLTypeDeb@Base" 0.8.0
(c++)"typeinfo for indexRecords@Base" 0.8.0
(c++)"typeinfo for pkgAcqMethod@Base" 0.8.0
(c++)"typeinfo for pkgCacheFile@Base" 0.8.0
(c++)"typeinfo for pkgIndexFile@Base" 0.8.0
(c++)"typeinfo for WeakPointable@Base" 0.8.0
- (c++)"typeinfo for debListParser@Base" 0.8.0
(c++)"typeinfo for pkgAcqArchive@Base" 0.8.0
- (c++)"typeinfo for pkgAcqMetaSig@Base" 0.8.0
(c++)"typeinfo for pkgTagSection@Base" 0.8.0
(c++)"typeinfo for OpTextProgress@Base" 0.8.0
- (c++)"typeinfo for debIFTypeTrans@Base" 0.8.0
- (c++)"typeinfo for debStatusIndex@Base" 0.8.0
- (c++)"typeinfo for debIFTypeStatus@Base" 0.8.0
- (c++)"typeinfo for debRecordParser@Base" 0.8.0
- (c++)"typeinfo for debReleaseIndex@Base" 0.8.0
- (c++)"typeinfo for debSLTypeDebSrc@Base" 0.8.0
- (c++)"typeinfo for debSLTypeDebian@Base" 0.8.0
- (c++)"typeinfo for debSourcesIndex@Base" 0.8.0
- (c++)"typeinfo for pkgAcqDiffIndex@Base" 0.8.0
- (c++)"typeinfo for pkgAcqMetaIndex@Base" 0.8.0
- (c++)"typeinfo for debPackagesIndex@Base" 0.8.0
- (c++)"typeinfo for pkgAcqIndexDiffs@Base" 0.8.0
(c++)"typeinfo for pkgAcquireStatus@Base" 0.8.0
(c++)"typeinfo for PreferenceSection@Base" 0.8.0
(c++)"typeinfo for pkgPackageManager@Base" 0.8.0
- (c++)"typeinfo for debSrcRecordParser@Base" 0.8.0
(c++)"typeinfo for debVersioningSystem@Base" 0.8.0
(c++)"typeinfo for pkgUdevCdromDevices@Base" 0.8.0
(c++)"typeinfo for pkgVersioningSystem@Base" 0.8.0
- (c++)"typeinfo for debTranslationsIndex@Base" 0.8.0
(c++)"typeinfo for MMap@Base" 0.8.0
(c++)"typeinfo for FileFd@Base" 0.8.0
(c++)"typeinfo for Vendor@Base" 0.8.0
@@ -832,7 +658,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"typeinfo for Configuration::MatchAgainstConfig@Base" 0.8.0
(c++)"typeinfo for pkgSourceList::Type@Base" 0.8.0
(c++)"typeinfo for pkgSrcRecords::Parser@Base" 0.8.0
- (c++)"typeinfo for pkgCacheGenerator::ListParser@Base" 0.8.0
(c++)"typeinfo for APT::CacheSetHelper@Base" 0.8.0
(c++)"typeinfo for pkgCache::DepIterator@Base" 0.8.0
(c++)"typeinfo for pkgCache::GrpIterator@Base" 0.8.0
@@ -859,42 +684,22 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"typeinfo name for pkgAcquire@Base" 0.8.0
(c++)"typeinfo name for DynamicMMap@Base" 0.8.0
(c++)"typeinfo name for PackageCopy@Base" 0.8.0
- (c++)"typeinfo name for pkgAcqIndex@Base" 0.8.0
(c++)"typeinfo name for pkgDepCache@Base" 0.8.0
(c++)"typeinfo name for pkgSimulate@Base" 0.8.0
- (c++)"typeinfo name for debIFTypePkg@Base" 0.8.0
- (c++)"typeinfo name for debIFTypeSrc@Base" 0.8.0
- (c++)"typeinfo name for debSLTypeDeb@Base" 0.8.0
(c++)"typeinfo name for indexRecords@Base" 0.8.0
(c++)"typeinfo name for pkgAcqMethod@Base" 0.8.0
(c++)"typeinfo name for pkgCacheFile@Base" 0.8.0
(c++)"typeinfo name for pkgIndexFile@Base" 0.8.0
(c++)"typeinfo name for WeakPointable@Base" 0.8.0
- (c++)"typeinfo name for debListParser@Base" 0.8.0
(c++)"typeinfo name for pkgAcqArchive@Base" 0.8.0
- (c++)"typeinfo name for pkgAcqMetaSig@Base" 0.8.0
(c++)"typeinfo name for pkgTagSection@Base" 0.8.0
(c++)"typeinfo name for OpTextProgress@Base" 0.8.0
- (c++)"typeinfo name for debIFTypeTrans@Base" 0.8.0
- (c++)"typeinfo name for debStatusIndex@Base" 0.8.0
- (c++)"typeinfo name for debIFTypeStatus@Base" 0.8.0
- (c++)"typeinfo name for debRecordParser@Base" 0.8.0
- (c++)"typeinfo name for debReleaseIndex@Base" 0.8.0
- (c++)"typeinfo name for debSLTypeDebSrc@Base" 0.8.0
- (c++)"typeinfo name for debSLTypeDebian@Base" 0.8.0
- (c++)"typeinfo name for debSourcesIndex@Base" 0.8.0
- (c++)"typeinfo name for pkgAcqDiffIndex@Base" 0.8.0
- (c++)"typeinfo name for pkgAcqMetaIndex@Base" 0.8.0
- (c++)"typeinfo name for debPackagesIndex@Base" 0.8.0
- (c++)"typeinfo name for pkgAcqIndexDiffs@Base" 0.8.0
(c++)"typeinfo name for pkgAcquireStatus@Base" 0.8.0
(c++)"typeinfo name for PreferenceSection@Base" 0.8.0
(c++)"typeinfo name for pkgPackageManager@Base" 0.8.0
- (c++)"typeinfo name for debSrcRecordParser@Base" 0.8.0
(c++)"typeinfo name for debVersioningSystem@Base" 0.8.0
(c++)"typeinfo name for pkgUdevCdromDevices@Base" 0.8.0
(c++)"typeinfo name for pkgVersioningSystem@Base" 0.8.0
- (c++)"typeinfo name for debTranslationsIndex@Base" 0.8.0
(c++)"typeinfo name for MMap@Base" 0.8.0
(c++)"typeinfo name for FileFd@Base" 0.8.0
(c++)"typeinfo name for Vendor@Base" 0.8.0
@@ -915,7 +720,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"typeinfo name for Configuration::MatchAgainstConfig@Base" 0.8.0
(c++)"typeinfo name for pkgSourceList::Type@Base" 0.8.0
(c++)"typeinfo name for pkgSrcRecords::Parser@Base" 0.8.0
- (c++)"typeinfo name for pkgCacheGenerator::ListParser@Base" 0.8.0
(c++)"typeinfo name for APT::CacheSetHelper@Base" 0.8.0
(c++)"typeinfo name for pkgCache::DepIterator@Base" 0.8.0
(c++)"typeinfo name for pkgCache::GrpIterator@Base" 0.8.0
@@ -942,41 +746,21 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"vtable for pkgAcquire@Base" 0.8.0
(c++)"vtable for DynamicMMap@Base" 0.8.0
(c++)"vtable for PackageCopy@Base" 0.8.0
- (c++)"vtable for pkgAcqIndex@Base" 0.8.0
(c++)"vtable for pkgDepCache@Base" 0.8.0
(c++)"vtable for pkgSimulate@Base" 0.8.0
- (c++)"vtable for debIFTypePkg@Base" 0.8.0
- (c++)"vtable for debIFTypeSrc@Base" 0.8.0
- (c++)"vtable for debSLTypeDeb@Base" 0.8.0
(c++)"vtable for indexRecords@Base" 0.8.0
(c++)"vtable for pkgAcqMethod@Base" 0.8.0
(c++)"vtable for pkgCacheFile@Base" 0.8.0
(c++)"vtable for pkgIndexFile@Base" 0.8.0
- (c++)"vtable for debListParser@Base" 0.8.0
(c++)"vtable for pkgAcqArchive@Base" 0.8.0
- (c++)"vtable for pkgAcqMetaSig@Base" 0.8.0
(c++)"vtable for pkgTagSection@Base" 0.8.0
(c++)"vtable for OpTextProgress@Base" 0.8.0
- (c++)"vtable for debIFTypeTrans@Base" 0.8.0
- (c++)"vtable for debStatusIndex@Base" 0.8.0
- (c++)"vtable for debIFTypeStatus@Base" 0.8.0
- (c++)"vtable for debRecordParser@Base" 0.8.0
- (c++)"vtable for debReleaseIndex@Base" 0.8.0
- (c++)"vtable for debSLTypeDebSrc@Base" 0.8.0
- (c++)"vtable for debSLTypeDebian@Base" 0.8.0
- (c++)"vtable for debSourcesIndex@Base" 0.8.0
- (c++)"vtable for pkgAcqDiffIndex@Base" 0.8.0
- (c++)"vtable for pkgAcqMetaIndex@Base" 0.8.0
- (c++)"vtable for debPackagesIndex@Base" 0.8.0
- (c++)"vtable for pkgAcqIndexDiffs@Base" 0.8.0
(c++)"vtable for pkgAcquireStatus@Base" 0.8.0
(c++)"vtable for PreferenceSection@Base" 0.8.0
(c++)"vtable for pkgPackageManager@Base" 0.8.0
- (c++)"vtable for debSrcRecordParser@Base" 0.8.0
(c++)"vtable for debVersioningSystem@Base" 0.8.0
(c++)"vtable for pkgUdevCdromDevices@Base" 0.8.0
(c++)"vtable for pkgVersioningSystem@Base" 0.8.0
- (c++)"vtable for debTranslationsIndex@Base" 0.8.0
(c++)"vtable for MMap@Base" 0.8.0
(c++)"vtable for FileFd@Base" 0.8.0
(c++)"vtable for Vendor@Base" 0.8.0
@@ -997,7 +781,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"vtable for Configuration::MatchAgainstConfig@Base" 0.8.0
(c++)"vtable for pkgSourceList::Type@Base" 0.8.0
(c++)"vtable for pkgSrcRecords::Parser@Base" 0.8.0
- (c++)"vtable for pkgCacheGenerator::ListParser@Base" 0.8.0
(c++)"vtable for APT::CacheSetHelper@Base" 0.8.0
(c++)"vtable for pkgCache::DepIterator@Base" 0.8.0
(c++)"vtable for pkgCache::GrpIterator@Base" 0.8.0
@@ -1020,8 +803,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"non-virtual thunk to pkgDepCache::DefaultRootSetFunc::~DefaultRootSetFunc()@Base" 0.8.0
(c++)"operator<<(std::basic_ostream<char, std::char_traits<char> >&, pkgCache::DepIterator)@Base" 0.8.0
(c++)"operator<<(std::basic_ostream<char, std::char_traits<char> >&, pkgCache::PkgIterator)@Base" 0.8.0
- _apt_DebSrcType@Base 0.8.0
- _apt_DebType@Base 0.8.0
_config@Base 0.8.0
_system@Base 0.8.0
debSys@Base 0.8.0
@@ -1082,59 +863,22 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"pkgDepCache::SetCandidateRelease(pkgCache::VerIterator, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11
(c++)"RealFileExists(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.11
(c++)"StripEpoch(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11
- (c++)"pkgAcqIndex::Init(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.11
(c++)"pkgTagSection::FindFlag(unsigned long&, unsigned long, char const*, char const*)@Base" 0.8.11
- (c++)"pkgAcqMetaClearSig::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.8.11
- (c++)"pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.11
- (c++)"pkgAcqMetaClearSig::~pkgAcqMetaClearSig()@Base" 0.8.11
- (c++)"IndexTarget::IsOptional() const@Base" 0.8.11
- (c++)"debReleaseIndex::TranslationIndexURI(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.11
- (c++)"debReleaseIndex::TranslationIndexURISuffix(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.8.11
- (c++)"typeinfo for pkgAcqMetaClearSig@Base" 0.8.11
- (c++)"typeinfo name for pkgAcqMetaClearSig@Base" 0.8.11
- (c++)"vtable for pkgAcqMetaClearSig@Base" 0.8.11
(c++)"FindMountPointForDevice(char const*)@Base" 0.8.12
(c++)"pkgUdevCdromDevices::ScanForRemovable(bool)@Base" 0.8.12
(c++)"APT::Configuration::Compressor::Compressor(char const*, char const*, char const*, char const*, char const*, unsigned short)@Base" 0.8.12
(c++)"APT::Configuration::Compressor::~Compressor()@Base" 0.8.12
(c++)"APT::Configuration::getCompressors(bool)@Base" 0.8.12
(c++)"APT::Configuration::getCompressorExtensions()@Base" 0.8.12
- (c++)"debListParser::NewProvidesAllArch(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.13.2
(c++)"pkgCache::DepIterator::IsNegative() const@Base" 0.8.15~exp1
(c++)"Configuration::CndSet(char const*, int)@Base" 0.8.15.3
(c++)"pkgProblemResolver::InstOrNewPolicyBroken(pkgCache::PkgIterator)@Base" 0.8.15.3
(c++)"DeEscapeString(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.15.4
(c++)"GetModificationTime(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.15.6
(c++)"pkgSourceList::GetLastModifiedTime()@Base" 0.8.15.6
- (c++)"pkgCacheGenerator::NewDepends(pkgCache::PkgIterator&, pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int const&, unsigned int const&, unsigned int*&)@Base" 0.8.15.6
(c++)"pkgCacheFile::RemoveCaches()@Base" 0.8.15.7
(c++)"pkgOrderList::VisitNode(pkgCache::PkgIterator, char const*)@Base" 0.8.15.7
### external dependency resolver ###
- (c++)"edspIFType::~edspIFType()@Base" 0.8.16~exp2
- (c++)"edspSystem::Initialize(Configuration&)@Base" 0.8.16~exp2
- (c++)"edspSystem::AddStatusFiles(std::vector<pkgIndexFile*, std::allocator<pkgIndexFile*> >&)@Base" 0.8.16~exp2
- (c++)"edspSystem::ArchiveSupported(char const*)@Base" 0.8.16~exp2
- (c++)"edspSystem::Lock()@Base" 0.8.16~exp2
- (c++)"edspSystem::Score(Configuration const&)@Base" 0.8.16~exp2
- (c++)"edspSystem::UnLock(bool)@Base" 0.8.16~exp2
- (c++)"edspSystem::edspSystem()@Base" 0.8.16~exp2
- (c++)"edspSystem::~edspSystem()@Base" 0.8.16~exp2
- (c++)"edspListParser::NewVersion(pkgCache::VerIterator&)@Base" 0.8.16~exp2
- (c++)"edspListParser::Description()@Base" 0.8.16~exp2
- (c++)"edspListParser::ParseStatus(pkgCache::PkgIterator&, pkgCache::VerIterator&)@Base" 0.8.16~exp2
- (c++)"edspListParser::VersionHash()@Base" 0.8.16~exp2
- (c++)"edspListParser::Description_md5()@Base" 0.8.16~exp2
- (c++)"edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator&, FileFd&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.16~exp2
- (c++)"edspListParser::DescriptionLanguage()@Base" 0.8.16~exp2
- (c++)"edspListParser::edspListParser(FileFd*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.16~exp2
- (c++)"edspListParser::~edspListParser()@Base" 0.8.16~exp2
- (c++)"edspIndex::edspIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.8.16~exp2
- (c++)"edspIndex::~edspIndex()@Base" 0.8.16~exp2
- (c++)"edspIFType::CreatePkgParser(pkgCache::PkgFileIterator) const@Base" 0.8.16~exp2
- (c++)"edspSystem::CreatePM(pkgDepCache*) const@Base" 0.8.16~exp2
- (c++)"edspSystem::FindIndex(pkgCache::PkgFileIterator, pkgIndexFile*&) const@Base" 0.8.16~exp2
- (c++)"edspIndex::Merge(pkgCacheGenerator&, OpProgress*) const@Base" 0.8.16~exp2
- (c++)"edspIndex::GetType() const@Base" 0.8.16~exp2
(c++)"EDSP::WriteError(char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, _IO_FILE*)@Base" 0.8.16~exp2
(c++)"EDSP::ReadRequest(int, std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&, bool&, bool&, bool&)@Base" 0.8.16~exp2
(c++)"EDSP::ApplyRequest(std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, std::list<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&, pkgDepCache&)@Base" 0.8.16~exp2
@@ -1149,19 +893,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"EDSP::PrioMap@Base" 0.8.16~exp2
(c++)"pkgDepCache::Policy::GetPriority(pkgCache::PkgIterator const&)@Base" 0.8.16~exp6
(c++)"pkgDepCache::Policy::GetPriority(pkgCache::PkgFileIterator const&)@Base" 0.8.16~exp6
- (c++)"typeinfo for edspIFType@Base" 0.8.16~exp2
- (c++)"typeinfo for edspSystem@Base" 0.8.16~exp2
- (c++)"typeinfo for edspListParser@Base" 0.8.16~exp2
- (c++)"typeinfo for edspIndex@Base" 0.8.16~exp2
- (c++)"typeinfo name for edspIFType@Base" 0.8.16~exp2
- (c++)"typeinfo name for edspSystem@Base" 0.8.16~exp2
- (c++)"typeinfo name for edspListParser@Base" 0.8.16~exp2
- (c++)"typeinfo name for edspIndex@Base" 0.8.16~exp2
- (c++)"vtable for edspIFType@Base" 0.8.16~exp2
- (c++)"vtable for edspSystem@Base" 0.8.16~exp2
- (c++)"vtable for edspListParser@Base" 0.8.16~exp2
- (c++)"vtable for edspIndex@Base" 0.8.16~exp2
- edspSys@Base 0.8.16~exp2
### generalisation of checksums (with lfs) -- mostly api-compatible available (without sha512 in previous versions)
(c++)"AddCRC16(unsigned short, void const*, unsigned long long)@Base" 0.8.16~exp2
(c++)"MD5Summation::Add(unsigned char const*, unsigned long long)@Base" 0.8.16~exp6
@@ -1207,39 +938,28 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"DynamicMMap::RawAllocate(unsigned long long, unsigned long)@Base" 0.8.16~exp6
(c++)"PackageCopy::GetFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long long&)@Base" 0.8.16~exp6
(c++)"pkgTagSection::~pkgTagSection()@Base" 0.8.16~exp6
- (c++)"debRecordParser::RecordField(char const*)@Base" 0.8.16~exp6
- (c++)"debReleaseIndex::SetTrusted(bool)@Base" 0.8.16~exp6
- (c++)"debReleaseIndex::debReleaseIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.8.16~exp6
(c++)"pkgAcquireStatus::Fetched(unsigned long long, unsigned long long)@Base" 0.8.16~exp6
(c++)"PreferenceSection::~PreferenceSection()@Base" 0.8.16~exp6
- (c++)"pkgCacheGenerator::NewDescription(pkgCache::DescIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, HashSumValue<128> const&, unsigned int)@Base" 0.8.16~exp6
(c++)"FileFd::Read(void*, unsigned long long, unsigned long long*)@Base" 0.8.16~exp6
(c++)"FileFd::Seek(unsigned long long)@Base" 0.8.16~exp6
(c++)"FileFd::Skip(unsigned long long)@Base" 0.8.16~exp6
(c++)"FileFd::Write(void const*, unsigned long long)@Base" 0.8.16~exp6
(c++)"FileFd::Truncate(unsigned long long)@Base" 0.8.16~exp6
(c++)"pkgPolicy::GetPriority(pkgCache::PkgFileIterator const&)@Base" 0.8.16~exp6
- (c++)"OptionalIndexTarget::IsOptional() const@Base" 0.8.16~exp6
(c++)"typeinfo for pkgTagFile@Base" 0.8.16~exp6
- (c++)"typeinfo for IndexTarget@Base" 0.8.16~exp6
(c++)"typeinfo for pkgSrcRecords@Base" 0.8.16~exp6
- (c++)"typeinfo for OptionalIndexTarget@Base" 0.8.16~exp6
(c++)"typeinfo for pkgAcquire::UriIterator@Base" 0.8.16~exp6
(c++)"typeinfo for pkgAcquire::MethodConfig@Base" 0.8.16~exp6
(c++)"typeinfo for pkgAcquire::Queue@Base" 0.8.16~exp6
(c++)"typeinfo for pkgAcquire::Worker@Base" 0.8.16~exp6
(c++)"typeinfo name for pkgTagFile@Base" 0.8.16~exp6
- (c++)"typeinfo name for IndexTarget@Base" 0.8.16~exp6
(c++)"typeinfo name for pkgSrcRecords@Base" 0.8.16~exp6
- (c++)"typeinfo name for OptionalIndexTarget@Base" 0.8.16~exp6
(c++)"typeinfo name for pkgAcquire::UriIterator@Base" 0.8.16~exp6
(c++)"typeinfo name for pkgAcquire::MethodConfig@Base" 0.8.16~exp6
(c++)"typeinfo name for pkgAcquire::Queue@Base" 0.8.16~exp6
(c++)"typeinfo name for pkgAcquire::Worker@Base" 0.8.16~exp6
(c++)"vtable for pkgTagFile@Base" 0.8.16~exp6
- (c++)"vtable for IndexTarget@Base" 0.8.16~exp6
(c++)"vtable for pkgSrcRecords@Base" 0.8.16~exp6
- (c++)"vtable for OptionalIndexTarget@Base" 0.8.16~exp6
(c++)"vtable for pkgAcquire::UriIterator@Base" 0.8.16~exp6
(c++)"vtable for pkgAcquire::MethodConfig@Base" 0.8.16~exp6
(c++)"vtable for pkgAcquire::Queue@Base" 0.8.16~exp6
@@ -1381,102 +1101,16 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"APT::Progress::PackageManagerFancy::instances@Base" 0.9.14.2
(c++)"APT::Progress::PackageManagerFancy::Start(int)@Base" 0.9.14.2
(c++)"APT::Progress::PackageManager::Start(int)@Base" 0.9.14.2
-### client-side merged pdiffs
- (c++)"pkgAcqIndexMergeDiffs::DescURI()@Base" 0.9.14.3~exp1
- (c++)"pkgAcqIndexMergeDiffs::Failed(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, pkgAcquire::MethodConfig*)@Base" 0.9.14.3~exp1
- (c++)"pkgAcqIndexMergeDiffs::~pkgAcqIndexMergeDiffs()@Base" 0.9.14.3~exp1
- (c++)"typeinfo for pkgAcqIndexMergeDiffs@Base" 0.9.14.3~exp1
- (c++)"typeinfo name for pkgAcqIndexMergeDiffs@Base" 0.9.14.3~exp1
- (c++)"vtable for pkgAcqIndexMergeDiffs@Base" 0.9.14.3~exp1
### deb822 sources.list format
(c++)"pkgSourceList::ParseFileDeb822(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.14.3~exp1
(c++)"pkgSourceList::ParseFileOldStyle(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.14.3~exp1
(c++)"pkgSourceList::Type::ParseStanza(std::vector<metaIndex*, std::allocator<metaIndex*> >&, pkgTagSection&, int, FileFd&)@Base" 0.9.14.3~exp1
### install foo.deb support
- (c++)"debDebFileMetaIndex::ArchiveURI(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 1.1~exp1
- (c++)"debDebFileMetaIndex::~debDebFileMetaIndex()@Base" 1.1~exp1
- (c++)"debDebFileMetaIndex::debDebFileMetaIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp1
- (c++)"debDebFileMetaIndex::GetIndexes(pkgAcquire*, bool const&) const@Base" 1.1~exp1
- (c++)"debDebFileMetaIndex::GetIndexFiles()@Base" 1.1~exp1
- (c++)"debDebFileMetaIndex::IsTrusted() const@Base" 1.1~exp1
- (c++)"debDebFileParser::~debDebFileParser()@Base" 1.1~exp1
- (c++)"debDebFileParser::debDebFileParser(FileFd*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp1
- (c++)"debDebFileParser::UsePackage(pkgCache::PkgIterator&, pkgCache::VerIterator&)@Base" 1.1~exp1
- (c++)"debDebFileRecordParser::~debDebFileRecordParser()@Base" 1.1~exp1
- (c++)"debDebFileRecordParser::FileName()@Base" 1.1~exp1
- (c++)"debDebianSourceDirIndex::~debDebianSourceDirIndex()@Base" 1.1~exp1
- (c++)"debDebianSourceDirIndex::GetType() const@Base" 1.1~exp1
- (c++)"debDebPkgFileIndex::ArchiveURI(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 1.1~exp1
- (c++)"debDebPkgFileIndex::~debDebPkgFileIndex()@Base" 1.1~exp1
- (c++)"debDebPkgFileIndex::debDebPkgFileIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 1.1~exp1
- (c++)"debDebPkgFileIndex::Describe(bool) const@Base" 1.1~exp1
- (c++)"debDebPkgFileIndex::Exists() const@Base" 1.1~exp1
- (c++)"debDebPkgFileIndex::FindInCache(pkgCache&) const@Base" 1.1~exp1
- (c++)"debDebPkgFileIndex::GetType() const@Base" 1.1~exp1
- (c++)"debDebPkgFileIndex::HasPackages() const@Base" 1.1~exp1
- (c++)"debDebPkgFileIndex::Merge(pkgCacheGenerator&, OpProgress*) const@Base" 1.1~exp1
- (c++)"debDebPkgFileIndex::Size() const@Base" 1.1~exp1
- (c++)"debDscFileIndex::CreateSrcParser() const@Base" 1.1~exp1
- (c++)"debDscFileIndex::~debDscFileIndex()@Base" 1.1~exp1
- (c++)"debDscFileIndex::debDscFileIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.1~exp1
- (c++)"debDscFileIndex::Describe(bool) const@Base" 1.1~exp1
- (c++)"debDscFileIndex::Exists() const@Base" 1.1~exp1
- (c++)"debDscFileIndex::GetType() const@Base" 1.1~exp1
- (c++)"debDscFileIndex::HasPackages() const@Base" 1.1~exp1
- (c++)"debDscFileIndex::Size() const@Base" 1.1~exp1
- (c++)"debDscRecordParser::~debDscRecordParser()@Base" 1.1~exp1
- (c++)"debDscRecordParser::debDscRecordParser(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, pkgIndexFile const*)@Base" 1.1~exp1
- (c++)"debIFTypeDebianSourceDir::CreateSrcPkgParser(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 1.1~exp1
- (c++)"debIFTypeDebianSourceDir::~debIFTypeDebianSourceDir()@Base" 1.1~exp1
- (c++)"debIFTypeDebPkgFile::CreatePkgParser(pkgCache::PkgFileIterator) const@Base" 1.1~exp1
- (c++)"debIFTypeDebPkgFile::~debIFTypeDebPkgFile()@Base" 1.1~exp1
- (c++)"debIFTypeDscFile::CreateSrcPkgParser(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 1.1~exp1
- (c++)"debIFTypeDscFile::~debIFTypeDscFile()@Base" 1.1~exp1
- (c++)"debListParser::AvailableDescriptionLanguages()@Base" 1.1~exp1
- (c++)"debListParser::Description(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp1
- (c++)"debListParser::SameVersion(unsigned short, pkgCache::VerIterator const&)@Base" 1.1~exp1
- (c++)"debReleaseIndex::LocalFileName() const@Base" 1.1~exp1
- (c++)"debSLTypeDebFile::CreateItem(std::vector<metaIndex*, std::allocator<metaIndex*> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&) const@Base" 1.1~exp1
- (c++)"debSLTypeDebFile::~debSLTypeDebFile()@Base" 1.1~exp1
(c++)"flAbsPath(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 1.1~exp1
(c++)"GetTempFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 1.1~exp1
(c++)"pkgIndexFile::Type::CreateSrcPkgParser(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 1.1~exp1
(c++)"metaIndex::LocalFileName() const@Base" 1.1~exp1
(c++)"metaIndex::~metaIndex()@Base" 1.1~exp1
- (c++)"typeinfo for debDebFileMetaIndex@Base" 1.1~exp1
- (c++)"typeinfo for debDebFileParser@Base" 1.1~exp1
- (c++)"typeinfo for debDebFileRecordParser@Base" 1.1~exp1
- (c++)"typeinfo for debDebianSourceDirIndex@Base" 1.1~exp1
- (c++)"typeinfo for debDebPkgFileIndex@Base" 1.1~exp1
- (c++)"typeinfo for debDscFileIndex@Base" 1.1~exp1
- (c++)"typeinfo for debDscRecordParser@Base" 1.1~exp1
- (c++)"typeinfo for debIFTypeDebianSourceDir@Base" 1.1~exp1
- (c++)"typeinfo for debIFTypeDebPkgFile@Base" 1.1~exp1
- (c++)"typeinfo for debIFTypeDscFile@Base" 1.1~exp1
- (c++)"typeinfo for debSLTypeDebFile@Base" 1.1~exp1
- (c++)"typeinfo name for debDebFileMetaIndex@Base" 1.1~exp1
- (c++)"typeinfo name for debDebFileParser@Base" 1.1~exp1
- (c++)"typeinfo name for debDebFileRecordParser@Base" 1.1~exp1
- (c++)"typeinfo name for debDebianSourceDirIndex@Base" 1.1~exp1
- (c++)"typeinfo name for debDebPkgFileIndex@Base" 1.1~exp1
- (c++)"typeinfo name for debDscFileIndex@Base" 1.1~exp1
- (c++)"typeinfo name for debDscRecordParser@Base" 1.1~exp1
- (c++)"typeinfo name for debIFTypeDebianSourceDir@Base" 1.1~exp1
- (c++)"typeinfo name for debIFTypeDebPkgFile@Base" 1.1~exp1
- (c++)"typeinfo name for debIFTypeDscFile@Base" 1.1~exp1
- (c++)"typeinfo name for debSLTypeDebFile@Base" 1.1~exp1
- (c++)"vtable for debDebFileMetaIndex@Base" 1.1~exp1
- (c++)"vtable for debDebFileParser@Base" 1.1~exp1
- (c++)"vtable for debDebFileRecordParser@Base" 1.1~exp1
- (c++)"vtable for debDebianSourceDirIndex@Base" 1.1~exp1
- (c++)"vtable for debDebPkgFileIndex@Base" 1.1~exp1
- (c++)"vtable for debDscFileIndex@Base" 1.1~exp1
- (c++)"vtable for debDscRecordParser@Base" 1.1~exp1
- (c++)"vtable for debIFTypeDebianSourceDir@Base" 1.1~exp1
- (c++)"vtable for debIFTypeDebPkgFile@Base" 1.1~exp1
- (c++)"vtable for debIFTypeDscFile@Base" 1.1~exp1
- (c++)"vtable for debSLTypeDebFile@Base" 1.1~exp1
- _apt_DebFileType@Base 1.1~exp1
### CacheFilter functors
(c++)"APT::CacheFilter::ANDMatcher::AND(APT::CacheFilter::Matcher*)@Base" 1.1~exp4
(c++)"APT::CacheFilter::ANDMatcher::ANDMatcher(APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*, APT::CacheFilter::Matcher*)@Base" 1.1~exp4
@@ -1595,9 +1229,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
# (c++|optional=inline)"pkgRecords::Parser::SHA1Hash()@Base" 0.8.0
# (c++|optional=inline)"pkgRecords::Parser::SHA256Hash()@Base" 0.8.0
# (c++|optional=inline)"pkgRecords::Parser::SHA512Hash()@Base" 0.8.16~exp6
- (c++)"debRecordParser::Hashes() const@Base" 1.1~exp1
- (c++)"debRecordParser::LongDesc(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp1
- (c++)"debRecordParser::ShortDesc(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp1
(c++)"Hashes::AddFD(FileFd&, unsigned long long, unsigned int)@Base" 1.1~exp1
(c++)"Hashes::AddFD(int, unsigned long long, unsigned int)@Base" 1.1~exp1
(c++)"Hashes::Add(unsigned char const*, unsigned long long, unsigned int)@Base" 1.1~exp1
@@ -1616,21 +1247,9 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"indexRecords::GetSupportsAcquireByHash() const@Base" 1.1~exp1
(c++)"pkgAcqArchive::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp1
(c++)"pkgAcqArchive::IsTrusted() const@Base" 1.1~exp1
- (c++)"pkgAcqDiffIndex::Custom600Headers() const@Base" 1.1~exp1
- (c++)"pkgAcqDiffIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp1
(c++)"pkgAcqFile::Custom600Headers() const@Base" 1.1~exp1
(c++)"pkgAcqFile::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp1
(c++)"pkgAcqFile::pkgAcqFile(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, HashStringList const&, unsigned long long, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 1.1~exp1
- (c++)"pkgAcqIndex::Custom600Headers() const@Base" 1.1~exp1
- (c++)"pkgAcqIndexDiffs::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp1
- (c++)"pkgAcqIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp1
- (c++)"pkgAcqIndex::InitByHashIfNeeded(std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 1.1~exp1
- (c++)"pkgAcqIndexMergeDiffs::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp1
- (c++)"pkgAcqMetaClearSig::Custom600Headers() const@Base" 1.1~exp1
- (c++)"pkgAcqMetaIndex::Custom600Headers() const@Base" 1.1~exp1
- (c++)"pkgAcqMetaIndex::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp1
- (c++)"pkgAcqMetaSig::Custom600Headers() const@Base" 1.1~exp1
- (c++)"pkgAcqMetaSig::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp1
(c++)"pkgAcqMethod::DropPrivsOrDie()@Base" 1.1~exp1
(c++)"pkgAcquire::Item::Custom600Headers() const@Base" 1.1~exp1
(c++)"pkgAcquire::Item::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp1
@@ -1644,19 +1263,8 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"typeinfo for pkgAcqBaseIndex@Base" 1.1~exp1
(c++)"typeinfo name for pkgAcqBaseIndex@Base" 1.1~exp1
(c++)"vtable for pkgAcqBaseIndex@Base" 1.1~exp1
- (c++)"DiffInfo::DiffInfo(DiffInfo const&)@Base" 1.1~exp4
### more transactional update
(c++)"pkgAcqBaseIndex::VerifyHashByMetaKey(HashStringList const&)@Base" 1.1~exp4
- (c++)"pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire*, pkgAcqMetaBase*, IndexTarget const*, HashStringList const&, indexRecords*)@Base" 1.1~exp4
- (c++)"pkgAcqIndex::AutoSelectCompression()@Base" 1.1~exp4
- (c++)"pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire*, pkgAcqMetaBase*, IndexTarget const*, HashStringList const&, indexRecords*, std::vector<DiffInfo, std::allocator<DiffInfo> >)@Base" 1.1~exp4
- (c++)"pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire*, pkgAcqMetaBase*, IndexTarget const*, HashStringList const&, indexRecords*, DiffInfo const&, std::vector<pkgAcqIndexMergeDiffs*, std::allocator<pkgAcqIndexMergeDiffs*> > const*)@Base" 1.1~exp4
- (c++)"pkgAcqIndex::pkgAcqIndex(pkgAcquire*, pkgAcqMetaBase*, IndexTarget const*, HashStringList const&, indexRecords*)@Base" 1.1~exp4
- (c++)"pkgAcqIndex::pkgAcqIndex(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, HashStringList const&)@Base" 1.1~exp4
- (c++)"pkgAcqIndex::ReverifyAfterIMS()@Base" 1.1~exp4
- (c++)"pkgAcqIndex::StageDecompressDone(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp4
- (c++)"pkgAcqIndex::StageDownloadDone(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp4
- (c++)"pkgAcqIndex::ValidateFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
(c++)"pkgAcqMetaBase::AbortTransaction()@Base" 1.1~exp4
(c++)"pkgAcqMetaBase::Add(pkgAcquire::Item*)@Base" 1.1~exp4
(c++)"pkgAcqMetaBase::CheckAuthDone(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
@@ -1670,11 +1278,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"pkgAcqMetaBase::TransactionStageCopy(pkgAcquire::Item*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
(c++)"pkgAcqMetaBase::TransactionStageRemoval(pkgAcquire::Item*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
(c++)"pkgAcqMetaBase::VerifyVendor(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
- (c++)"pkgAcqMetaClearSig::Done(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned long long, HashStringList const&, pkgAcquire::MethodConfig*)@Base" 1.1~exp4
- (c++)"pkgAcqMetaIndex::Finished()@Base" 1.1~exp4
- (c++)"pkgAcqMetaIndex::Init(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 1.1~exp4
- (c++)"pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire*, pkgAcqMetaBase*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 1.1~exp4
- (c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, pkgAcqMetaBase*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 1.1~exp4
(c++)"pkgAcquire::GetLock(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp4
(c++)"pkgAcquire::Item::Dequeue()@Base" 1.1~exp4
(c++)"pkgAcquire::Item::Item(pkgAcquire*, HashStringList const&, pkgAcqMetaBase*)@Base" 1.1~exp4
@@ -1710,7 +1313,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"pkgCdrom::DropTranslation(std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&)@Base" 0.9.7.5
(c++)"pkgCache::DepIterator::IsSatisfied(pkgCache::PrvIterator const&) const@Base" 0.9.8
(c++)"pkgCache::DepIterator::IsSatisfied(pkgCache::VerIterator const&) const@Base" 0.9.8
- (c++)"pkgCacheGenerator::NewDepends(pkgCache::PkgIterator&, pkgCache::VerIterator&, unsigned int, unsigned int const&, unsigned int const&, unsigned int*&)@Base" 0.9.8
(c++)"operator<<(std::basic_ostream<char, std::char_traits<char> >&, GlobalError::Item)@Base" 0.9.9
(c++)"pkgDepCache::IsDeleteOkProtectInstallRequests(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.9.9.1
(c++)"pkgDepCache::IsInstallOkMultiArchSameVersionSynced(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 0.9.9.1
@@ -1740,7 +1342,6 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"debListParser::ParseDepends(char const*, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&)@Base" 0.9.16
(c++)"debListParser::ParseDepends(char const*, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&, bool const&)@Base" 0.9.16
(c++)"debListParser::ParseDepends(char const*, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&, bool const&, bool const&, bool const&)@Base" 0.9.16
- (c++)"pkgCacheGenerator::ListParser::SameVersion(unsigned short, pkgCache::VerIterator const&)@Base" 0.9.16
(c++)"Rename(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 0.9.16
(c++)"pkgDepCache::IsInstallOkDependenciesSatisfiableByCandidates(pkgCache::PkgIterator const&, bool, unsigned long, bool)@Base" 1.0
(c++)"APT::Progress::PackageManagerFancy::GetTerminalSize()@Base" 1.0
@@ -1749,14 +1350,24 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"pkgCdromStatus::SetTotal(int)@Base" 1.0
(c++)"EDSP::ExecuteSolver(char const*, int*, int*, bool)@Base" 1.0.4
(c++)"pkgPackageManager::EarlyRemove(pkgCache::PkgIterator, pkgCache::DepIterator const*)@Base" 1.0.4
+ (c++)"pkgSrcRecords::Step()@Base" 1.0.4
(c++)"debTranslationsParser::Architecture()@Base" 1.0.4
(c++)"debTranslationsParser::~debTranslationsParser()@Base" 1.0.4
(c++)"debTranslationsParser::Version()@Base" 1.0.4
(c++)"typeinfo for debTranslationsParser@Base" 1.0.4
(c++)"typeinfo name for debTranslationsParser@Base" 1.0.4
(c++)"vtable for debTranslationsParser@Base" 1.0.4
- (c++)"pkgSrcRecords::Step()@Base" 1.0.4
(c++)"pkgDPkgPM::SetupSlavePtyMagic()@Base" 1.0.8
+ (c++)"HashStringList::find(char const*) const@Base" 1.0.9.4
+ (c++)"HashStringList::operator==(HashStringList const&) const@Base" 1.0.9.4
+ (c++)"HashStringList::operator!=(HashStringList const&) const@Base" 1.0.9.4
+ (c++)"HashStringList::push_back(HashString const&)@Base" 1.0.9.4
+ (c++)"HashStringList::supported(char const*)@Base" 1.0.9.4
+ (c++)"HashStringList::VerifyFile(std::basic_string<char, std::char_traits<char>, std::allocator<char> >) const@Base" 1.0.9.4
+ (c++)"HashString::operator==(HashString const&) const@Base" 1.0.9.4
+ (c++)"HashString::operator!=(HashString const&) const@Base" 1.0.9.4
+ (c++)"pkgSrcRecords::Parser::Files2(std::vector<pkgSrcRecords::File2, std::allocator<pkgSrcRecords::File2> >&)@Base" 1.0.9.4
+ (c++)"debSrcRecordParser::Files2(std::vector<pkgSrcRecords::File2, std::allocator<pkgSrcRecords::File2> >&)@Base" 1.0.9.4
(c++)"APT::Progress::PackageManager::PackageManager()@Base" 1.1~exp1
(c++)"pkgDPkgPM::Go(APT::Progress::PackageManager*)@Base" 1.1~exp1
(c++)"pkgPackageManager::DoInstall(APT::Progress::PackageManager*)@Base" 1.1~exp1
@@ -1771,34 +1382,28 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
(c++)"Popen(char const**, FileFd&, int&, FileFd::OpenMode)@Base" 1.1~exp1
(c++)"APT::String::Startswith(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp2
(c++)"APT::Upgrade::Upgrade(pkgDepCache&, int, OpProgress*)@Base" 1.1~exp4
- (c++)"pkgAllUpgrade(pkgDepCache&, OpProgress*)@Base" 1.1~exp4
- (c++)"pkgDistUpgrade(pkgDepCache&, OpProgress*)@Base" 1.1~exp4
(c++)"pkgProblemResolver::Resolve(bool, OpProgress*)@Base" 1.1~exp4
(c++)"pkgProblemResolver::ResolveByKeep(OpProgress*)@Base" 1.1~exp4
- (c++)"pkgCacheGenerator::NewVersion(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int, unsigned short, unsigned int)@Base" 1.1~exp4
- (c++)"pkgCacheGenerator::StoreString(pkgCacheGenerator::StringType, char const*, unsigned int)@Base" 1.1~exp4
(c++)"pkgCache::PkgIterator::Section() const@Base" 1.1~exp4
(c++)"APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::iterator::getPkg() const@Base" 1.1~exp4
(c++)"typeinfo for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::iterator@Base" 1.1~exp4
(c++)"typeinfo name for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::iterator@Base" 1.1~exp4
(c++)"vtable for APT::PackageContainer<std::set<pkgCache::PkgIterator, std::less<pkgCache::PkgIterator>, std::allocator<pkgCache::PkgIterator> > >::iterator@Base" 1.1~exp4
- (c++)"pkgAcqIndex::GetFinalFilename() const@Base" 1.1~exp4
(c++)"DropPrivileges()@Base" 1.1~exp4
(c++)"FileFd::FileFd(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unsigned int, unsigned long)@Base" 1.1~exp4
(c++)"indexRecords::indexRecords(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.1~exp5
(c++)"indexRecords::IsAlwaysTrusted() const@Base" 1.1~exp5
(c++)"indexRecords::IsNeverTrusted() const@Base" 1.1~exp5
(c++)"indexRecords::SetTrusted(bool)@Base" 1.1~exp5
+ (c++)"metaIndex::metaIndex(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, char const*)@Base" 1.1~exp9
+ (c++)"pkgTagSection::Get(char const*&, char const*&, unsigned int) const@Base" 1.1~exp9
### demangle strangeness - buildd report it as MISSING and as new…
- (c++)"pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.0
(c++)"pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<IndexTarget*, std::allocator<IndexTarget*> > const*, indexRecords*)@Base" 0.8.0
### gcc-4.6 artefacts
# (c++|optional=implicit)"HashString::operator=(HashString const&)@Base" 0.8.0
# (c++|optional=implicit)"HashString::HashString(HashString const&)@Base" 0.8.0
# (c++|optional=inline)"APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator std::max_element<APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator, CompareProviders>(APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator, APT::VersionContainer<std::list<pkgCache::VerIterator, std::allocator<pkgCache::VerIterator> > >::iterator, CompareProviders)@Base" 0.8.0
# (c++|optional=inline)"pkgCache::VerIterator::ParentPkg() const@Base" 0.8.0
-### gcc-4.8 artefacts
-# (c++|optional=implicit)"debSLTypeDebian::~debSLTypeDebian()@Base" 0.8.0
### empty destructors included in the .h file
# (c++|optional=inline)"pkgVersioningSystem::~pkgVersioningSystem()@Base" 0.8.0
# (c++|optional=inline)"pkgSystem::~pkgSystem()@Base" 0.8.0
@@ -1807,10 +1412,8 @@ libapt-pkg.so.4.15 libapt-pkg4.15 #MINVER#
# (c++|optional=inline)"pkgIndexFile::Type::~Type()@Base" 0.8.0
# (c++|optional=inline)"pkgSourceList::Type::~Type()@Base" 0.8.0
# (c++|optional=inline)"pkgIndexFile::~pkgIndexFile()@Base" 0.8.0
-# (c++|optional=inline)"pkgCacheGenerator::ListParser::~ListParser()@Base" 0.8.0
# (c++|optional=inline)"metaIndex::~metaIndex()@Base" 0.8.0
### std library artefacts
- (c++|regex|optional=std)"^std::vector<DiffInfo, .+@Base$" 0.8.0
(c++|regex|optional=std)"^std::vector<.+ >::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0
(c++|optional=std)"char* std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_S_construct<__gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >(__gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<char> const&, std::forward_iterator_tag)@Base" 0.8.0
(c++|optional=std)"char* std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_S_construct<__gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >(__gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, __gnu_cxx::__normal_iterator<char*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<char> const&, std::forward_iterator_tag)@Base" 0.8.0
diff --git a/debian/tests/run-tests b/debian/tests/run-tests
index 9d7c484fc..e459d7093 100644
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -11,10 +11,12 @@ make -C test/interactive-helper/
# run tests against the installed apt, use "env -i" to ensure
# the host env does not pollute our environment
env -i \
+APT_INTEGRATION_TESTS_SOURCE_DIR=$(pwd) \
APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR=$(pwd)/build/bin \
APT_INTEGRATION_TESTS_METHODS_DIR=/usr/lib/apt/methods \
APT_INTEGRATION_TESTS_LIBEXEC_DIR=/usr/lib/apt/ \
APT_INTEGRATION_TESTS_INTERNAL_SOLVER=/usr/lib/apt/solvers/apt \
+APT_INTEGRATION_TESTS_DUMP_SOLVER=/usr/lib/apt/solvers/dump \
APT_INTEGRATION_TESTS_BUILD_DIR=/usr/bin \
APT_INTEGRATION_TESTS_LIBRARY_PATH=/dev/null/does/not/exist \
./test/integration/run-tests
diff --git a/doc/acquire-additional-files.txt b/doc/acquire-additional-files.txt
new file mode 100644
index 000000000..f9a16318d
--- /dev/null
+++ b/doc/acquire-additional-files.txt
@@ -0,0 +1,229 @@
+# Acquire additional files in 'update' operations
+
+The download and verification of data from multiple sources in different
+compression formats, with partial downloads and patches is an involved
+process which is hard to implement correctly and securely.
+
+APT frontends share the code and binaries to make this happen in libapt
+with the Acquire system, supported by helpers shipped in the apt package
+itself and additional transports in individual packages like
+apt-transport-https.
+
+For its own operation libapt needs or can make use of Packages, Sources
+and Translation-* files, which it will acquire by default, but
+a repository might contain more data files (e.g. Contents) a frontend
+might want to use and would therefore need to be downloaded as well
+(e.g. apt-file).
+
+This file describes the configuration scheme such a frontend can use to
+instruct the Acquire system to download those additional files.
+
+# The Configuration Stanza
+
+The Acquire system uses the same configuration settings to implement the
+files it downloads by default. These settings are the default, but if
+they would be written in a configuration file the configuration
+instructing the Acquire system to download the Packages files would look
+like this (see also apt.conf(5) manpage for configuration file syntax):
+
+ APT::Acquire::Targets::deb::Packages {
+ MetaKey "$(COMPONENT)/binary-$(ARCHITECTURE)/Packages";
+ ShortDescription "Packages";
+ Description "$(SITE) $(RELEASE)/$(COMPONENT) $(ARCHITECTURE) Packages";
+
+ flatMetaKey "Packages";
+ flatDescription "$(SITE) $(RELEASE) Packages";
+
+ Optional "false";
+ };
+
+All files which should be downloaded (nicknamed 'Targets') are mentioned
+below the APT::Acquire::Targets scope. 'deb' is here the type of the
+sources.list entry the file should be acquired for. The only other
+supported value is hence 'deb-src'. Beware: You can't specify multiple
+types here and you can't download the same (evaluated) MetaKey from
+multiple types!
+
+After the type you can pick any valid and unique string which preferable
+refers to the file it downloads (In the example we picked 'Packages').
+This string is used as identifier for the target class and accessible as
+'Created-By' e.g. in the "apt-get files" output as detailed below.
+
+All targets have three main properties you can define:
+* MetaKey: The identifier of the file to be downloaded as used in the
+ Release file. It is also the relative location of the file from the
+ Release file. You can neither download from a different server
+ entirely (absolute URI) nor access directories above the Release file
+ (e.g. "../../").
+* ShortDescription: Very short string intended to be displayed to the
+ user e.g. while reporting progress. apt will e.g. use this string in
+ the last line to indicate progress of e.g. the download of a specific
+ item.
+* Description: A preferable human understandable and readable identifier
+ of which file is acquired exactly. Mainly used for progress reporting
+ and error messages. apt will e.g. use this string in the Get/Hit/Err
+ progress lines.
+
+Additional optional properties:
+* flat{MetaKey,Description}: APT supports two types of repositories:
+ dists-style repositories which are the default and by far the most
+ common which are named after the fact that the files are in an
+ elaborated directory structure. In contrast a flat-style repositories
+ lumps all files together in one directory. Support for these flat
+ repositories exists mainly for legacy purposes only. It is therefore
+ recommend to not set these values.
+* Optional: The default value is 'true' and should be kept at this
+ value. If enabled the acquire system will skip the download if the
+ file isn't mentioned in the Release file. Otherwise this is treated as
+ a hard error and the update process fails. Note that failures while
+ downloading (e.g. 404 or hash verification errors) are failures,
+ regardless of this setting.
+
+
+The acquire system will automatically choose to download a compressed
+file if it is available and uncompress it for you, just as it will also
+use pdiff patching if provided by the repository and enabled by the
+user. You only have to ensure that the Release file contains the
+information about the compressed files/pdiffs to make this happen.
+NO properties have to be set to enable this.
+
+# More examples
+
+The stanzas for Translation-* files as well as for Sources files would
+look like this:
+
+APT::Acquire::Targets {
+ deb::Translations {
+ MetaKey "$(COMPONENT)/i18n/Translation-$(LANGUAGE)";
+ ShortDescription "Translation-$(LANGUAGE)";
+ Description "$(SITE) $(RELEASE)/$(COMPONENT) Translation-$(LANGUAGE)";
+
+ flatMetaKey "$(LANGUAGE)";
+ flatDescription "$(SITE) $(RELEASE) Translation-$(LANGUAGE)";
+ };
+
+ deb-src::Sources {
+ MetaKey "$(COMPONENT)/source/Sources";
+ ShortDescription "Sources";
+ Description "$(SITE) $(RELEASE)/$(COMPONENT) Sources";
+
+ flatMetaKey "Sources";
+ flatDescription "$(SITE) $(RELEASE) Sources";
+
+ Optional "false";
+ };
+};
+
+# Substitution variables
+
+As seen in the examples, properties can contain placeholders filled in
+by the acquire system. The following variables are known; note that
+unknown variables have no default value nor are they touched: They are
+printed as-is.
+
+* $(SITE): An identifier of the site we access as seen in sources.list,
+ e.g. "http://example.org/debian" or "file:/path/to/a/repository". You
+ can't use this field in {,flat}MetaKey, it is for description proposes
+ only.
+* $(RELEASE): This is usually an archive- or codename, e.g. "stable" or
+ "stretch". Note that flat-style repositories do not have a archive-
+ or codename per-se, so the value might very well be just "/" or so.
+ Again, as seen in the sources.list.
+* $(COMPONENT): as given in the sources.list, e.g. "main", "non-free" or
+ "universe". Note that flat-style repositories again do not really
+ have a meaningful value here.
+* $(LANGUAGE): Values are all entries (expect "none") of configuration
+ option Acquire::Languages, e.g. "en", "de" or "de_AT".
+* $(ARCHITECTURE): Values are all entries of configuration option
+ APT::Architectures (potentially modified by sources.list options),
+ e.g. "amd64", "i386" or "armel" for the 'deb' type. In type 'deb-src'
+ this variable has the value "source".
+
+Note that while more variables might exist in the implementation, these
+are to be considered undefined and their usage strongly discouraged. If
+you have a need for other variables contact us.
+
+# Accessing files
+
+Do NOT hardcode specific file locations, names or compression types in
+your application! You will notice that the configuration options give
+you no choice over where the downloaded files will be stored. This is by
+design so multiple applications can download and use the same file
+rather than each and every one of them potentially downloads and uses
+its own copy somewhere on disk.
+
+"apt-get files" can be used to get the location as well as other
+information about all files downloaded (aka: you will see Packages,
+Sources and Translation-* files here as well). Provide a line of the
+default output format as parameter to filter out all entries which do
+not have such a line. With --format, you can further more define your
+own output style. The variables are what you see in the output, just all
+uppercase and wrapped in $(), as in the configuration file.
+
+To get all the filenames of all Translation-en files you can e.g. call:
+ apt-get files --format '$(FILENAME)' "Created-By: Translations" "Language: en"
+
+Accessing this information via libapt is done by reading the
+sources.lists (pkgSourceList), iterating over the metaIndex objects this
+creates and calling GetIndexTargets() on them. See the sourcecode of
+"apt-get files" for a complete example.
+
+Note that by default targets are not listed if they weren't downloaded.
+If you want to see all targets, you can use the --no-release-info, which
+also removes the Codename, Suite, Version, Origin, Label and Trusted
+fields from the output as these also display data which needs to be
+downloaded first and could hence be inaccurate [on the pro-side: This
+mode is faster as it doesn't require a valid binary cache to operate].
+The most notable difference perhaps is in the Filename field through: By
+default it indicates an existing file, potentially compressed (Hint:
+libapt users can use FileFd to open compressed files transparently). In
+the --no-release-info mode the indicated file doesn't need to exist and
+it will always refer to an uncompressed file, even if the index would be
+(or is) stored compressed.
+
+Remarks on fields only available in (default) --release-info mode:
+* Trusted: Denotes with a 'yes' or 'no' if the data in this file is
+ authenticated by a trustchain rooted in a trusted gpg key. You should
+ be careful with untrusted data and warn the user if you use it.
+* Codename, Suite, Version, Origin and Label are fields from the Release
+ file, are only present if they are present in the Release file and
+ contain the same data.
+
+Remarks on other available fields:
+* MetaKey, ShortDesc, Description, Site, Release: as defined
+ by the configuration and described further above.
+* Created-By: configuration entity responsible for this target
+* Target-Of: type of the sources.list entry
+* URI, Repo-URI: avoid using. Contains potentially username/password.
+ Prefer 'Site', especially for display.
+* Optional: Decodes the option of the same name from the configuration.
+ Note that it is using 'yes' and 'no' instead of 'true' and 'false'.
+* Language, Architecture, Component: as defined further above, but with
+ the catch that they might be missing if they don't effect the target
+ (aka: They weren't used while evaluating the MetaKey template).
+
+Again, additional fields might be visible in certain implementations,
+but you should avoid using them and instead talk to us about a portable
+implementation.
+
+# Multiple application requiring the same files
+
+It is highly encouraged that applications talk to each other and to us
+about which files they require. It is usually best to have a common
+package ship the configuration needed to get the files, but specific
+needs might require specific solutions. Again: talk to us.
+
+# Acquiring files not mentioned in the Release file
+
+You can't. This is by design as these files couldn't be verified to not
+be modified in transit, corrupted by the download process or simple if
+they are present at all on the server, which would require apt to probe
+for them. APT did this in the past for legacy reasons, we do not intend
+to go back to these dark times.
+
+This is also why you can't request files from a different server. It
+would have the additional problem that this server might not even be
+accessible (e.g. proxy settings) or that local sources (file:/, cdrom:/)
+start requesting online files…
+
+In other words: We would be opening Pandora's box.
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index a372a0d30..5b6788ed4 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -230,19 +230,30 @@
</varlistentry>
<varlistentry><term><option>changelog</option></term>
- <listitem><para><literal>changelog</literal> downloads a package changelog and displays
- it through <command>sensible-pager</command>. The server name and base
- directory is defined in the <literal>APT::Changelogs::Server</literal>
- variable (e.g. <ulink url="http://packages.debian.org/changelogs">packages.debian.org/changelogs</ulink> for
- Debian or <ulink url="http://changelogs.ubuntu.com/changelogs">changelogs.ubuntu.com/changelogs</ulink> for
- Ubuntu).
- By default it displays the changelog for the version that is
- installed. However, you can specify the same options as for
- the <option>install</option> command.
- </para>
+ <listitem><para><literal>changelog</literal> tries to download the
+ changelog of a package and displays it through
+ <command>sensible-pager</command>. By default it
+ displays the changelog for the version that is installed.
+ However, you can specify the same options as for the
+ <option>install</option> command.</para>
</listitem>
</varlistentry>
+ <varlistentry><term><option>files</option></term>
+ <listitem><para>Displays by default a deb822 formatted listing of
+ information about all data files <command>apt-get
+ update</command> would download. Supports a
+ <option>--format</option> option to modify the output format as
+ well as accepts lines of the default output to filter the records
+ by. The command is mainly used as an interface for external tools
+ working with APT to get information as well as filenames for
+ downloaded files so they can use them as well instead of
+ downloading them again on their own. Detailed documentation is
+ omitted here and can instead be found in the source tree in
+ <literal><filename>doc/acquire-additional-files.txt</filename></literal>.
+ </para>
+ </listitem>
+ </varlistentry>
</variablelist>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 143145344..c913e617c 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -225,13 +225,13 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.1~exp7">
+<!ENTITY apt-product-version "1.0.9.8">
<!-- (Code)names for various things used all over the place -->
-<!ENTITY oldstable-codename "squeeze">
-<!ENTITY stable-codename "wheezy">
-<!ENTITY testing-codename "jessie">
-<!ENTITY stable-version "7">
+<!ENTITY oldstable-codename "wheezy">
+<!ENTITY stable-codename "jessie">
+<!ENTITY testing-codename "stretch">
+<!ENTITY stable-version "8">
<!ENTITY ubuntu-codename "trusty">
<!-- good and bad just refers to matching and not matching a pattern…
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index efe986ea8..7d5f7e9b3 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -618,6 +618,33 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
</para></listitem>
</varlistentry>
+ <varlistentry><term><option>Changelogs::URI</option> scope</term>
+ <listitem><para>
+ Acquiring changelogs can only be done if an URI is known from where to get them.
+ Preferable the Release file indicates this in a 'Changelogs' field. If this isn't
+ available the Label/Origin field of the Release file is used to check if a
+ <literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</replaceable></literal> or
+ <literal>Acquire::Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> option
+ exists and if so this value is taken. The value in the Release file can be overridden
+ with <literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</replaceable></literal>
+ or <literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></literal>.
+
+ The value should be a normal URI to a text file, expect that package specific data is
+ replaced with the placeholder <literal>CHANGEPATH</literal>. The
+ value for it is: 1. if the package is from a component (e.g. <literal>main</literal>)
+ this is the first part otherwise it is omitted, 2. the first letter of source package name,
+ expect if the source package name starts with '<literal>lib</literal>' in which case it will
+ be the first four letters. 3. The complete source package name. 4. the complete name again and
+ 5. the source version.
+ The first (if present), second, third and fourth part are separated by a slash ('<literal>/</literal>')
+ and between the fourth and fifth part is an underscore ('<literal>_</literal>').
+
+ The special value '<literal>no</literal>' is available for this option indicating that
+ this source can't be used to acquire changelog files from. Another source will be tried
+ if available in this case.
+ </para></listitem>
+ </varlistentry>
+
</variablelist>
</refsect1>
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index ef1ae056d..1339335fa 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -117,14 +117,6 @@ APT
// does a ExecFork)
Keep-Fds {};
- Changelogs
- {
- // server the provides the changelogs, the code will assume
- // the changlogs are in the pool/ under a srcpkg_ver directory
- // with the name "changelog"
- Server "http://packages.debian.org/changelogs";
- }:
-
// control parameters for cron jobs by /etc/cron.daily/apt
Periodic
{
@@ -305,6 +297,9 @@ Acquire
"none";
"fr";
};
+
+ // Location of the changelogs with the placeholder CHANGEPATH (e.g. "main/a/apt/apt_1.1")
+ Changelogs::URI::Origin::Debian "http://metadata.ftp-master.debian.org/changelogs/CHANGEPATH_changelog";
};
// Directory layout
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 527097bd9..98c2b66b5 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt-doc 1.1~exp3\n"
+"Project-Id-Version: apt-doc 1.0.9.7\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-10 09:48+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 614d7e8c7..85869a2b7 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -6,19 +6,20 @@
# Jérôme Marant, 2000.
# Philippe Batailler, 2005.
# Christian Perrier <bubulle@debian.org>, 2009, 2010, 2011, 2012, 2013.
+# Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>, 2014.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
-"PO-Revision-Date: 2014-07-04 01:28+0200\n"
-"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
+"PO-Revision-Date: 2014-11-15 17:26+0100\n"
+"Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.5\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
@@ -628,7 +629,7 @@ msgstr "APT"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt.8.xml:28
msgid "command-line interface"
-msgstr ""
+msgstr "interface en ligne de commande"
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
@@ -647,6 +648,10 @@ msgid ""
"management of the system. See also &apt-get; and &apt-cache; for more low-"
"level command options."
msgstr ""
+"<command>apt</command> (Advanced Package Tool) est un outil en ligne de "
+"commande pour gérer les paquets. Il fournit une interface en ligne de "
+"commande au système de gestion de paquets. Voir également &apt-get; et &apt-"
+"cache; pour davantage d'options en ligne de commande."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:43
@@ -656,6 +661,10 @@ msgid ""
"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
"versions</option> are supported."
msgstr ""
+"La commande <literal>list</literal> est utilisée pour afficher une liste de "
+"paquets. Il gère les motifs du shell pour chercher les noms de paquets, "
+"ainsi que les options suivantes : <option>--installed</option>, <option>--"
+"upgradable</option>, <option>--all-versions</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:54
@@ -663,19 +672,17 @@ msgid ""
"<literal>search</literal> searches for the given term(s) and display "
"matching packages."
msgstr ""
+"La commande <literal>search</literal> recherche le(s) terme(s) donnée(s) et "
+"affiche les paquets correspondants."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:60
-#, fuzzy
-#| msgid ""
-#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
-#| "package has."
msgid ""
"<literal>show</literal> shows the package information for the given "
"package(s)."
msgstr ""
-"La commande <literal>rdepends</literal> affiche la liste de toutes les "
-"dépendances inverses d'un paquet."
+"La commande <literal>show</literal> affiche les informations sur le(s) "
+"paquet(s) donné(s)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:67
@@ -683,6 +690,8 @@ msgid ""
"<literal>install</literal> is followed by one or more package names desired "
"for installation or upgrading."
msgstr ""
+"La commande <literal>install</literal> est suivie du nom de un ou plusieurs "
+"paquets dont l'installation ou la mise à jour est souhaitée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:71 apt-get.8.xml:112
@@ -723,19 +732,17 @@ msgid ""
"<literal>edit-sources</literal> lets you edit your sources.list file and "
"provides basic sanity checks."
msgstr ""
+"La commande <literal>edit-sources</literal> permet de modifier le fichier "
+"sources.list et fournit des vérifications de sécurité de base."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:95
-#, fuzzy
-#| msgid ""
-#| "<literal>showhold</literal> is used to print a list of packages on hold "
-#| "in the same way as for the other show commands."
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources."
msgstr ""
-"<literal>showhold</literal> permet d'afficher la liste des paquets conservés "
-"de manière analogue aux commandes de même type."
+"La commande <literal>update</literal> permet de resynchroniser un fichier "
+"d'index répertoriant les paquets disponibles et sa source."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:101
@@ -745,6 +752,11 @@ msgid ""
"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
"but existing packages will never be removed."
msgstr ""
+"La commande <literal>upgrade</literal> permet d'installer les versions les "
+"plus récentes de tous les paquets présents sur le système en utilisant les "
+"sources énumérées dans <filename>/etc/apt/sources.list</filename>. De "
+"nouveaux paquets seront installés, mais les paquets installés ne seront "
+"jamais supprimés."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:110
@@ -753,6 +765,9 @@ msgid ""
"also remove installed packages if that is required in order to resolve a "
"package conflict."
msgstr ""
+"La commande <literal>full-upgrade</literal> remplit la même fonction que "
+"upgrade mais peut aussi supprimer des paquets installés si cela est "
+"nécessaire pour résoudre un conflit entre des paquets."
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
@@ -764,7 +779,7 @@ msgstr "options"
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:130
msgid "Script usage"
-msgstr ""
+msgstr "Utilisation de scripts"
#. type: Content of: <refentry><refsect1><para>
#: apt.8.xml:132
@@ -775,11 +790,17 @@ msgid ""
"&apt-cache; and &apt-get; via APT options. Please prefer using these "
"commands in your scripts."
msgstr ""
+"La ligne de commande de &apt; est conçue comme un outil pour l'utilisateur "
+"et les sorties peuvent varier selon ses versions. Bien qu'il s'efforce de ne "
+"pas casser les compatibilités ascendantes, cela ne peut pas non plus être "
+"garanti. Toutes les fonctionnalités de &apt; existent dans &apt-cache; et "
+"&apt-get; grâce aux options de APT. Il est conseillé d'utiliser ces "
+"commandes dans vos scripts."
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:140
msgid "Differences to &apt-get;"
-msgstr ""
+msgstr "Différences avec &apt-get;"
#. type: Content of: <refentry><refsect1><para>
#: apt.8.xml:141
@@ -788,20 +809,19 @@ msgid ""
"does not need to be backward compatible like &apt-get;. Therefore some "
"options are different:"
msgstr ""
+"La commande <command>apt</command> est sensée être agréable à l'utilisateur "
+"et ne pas avoir besoin de compatibilité ascendante comme &apt-get;. Par "
+"conséquent, certaines options sont différentes :"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: apt.8.xml:147
-#, fuzzy
-#| msgid "the <literal>Package:</literal> line"
msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "la ligne <literal>Package:</literal>"
+msgstr "L'option <literal>DPkg::Progress-Fancy</literal> est activée."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: apt.8.xml:151
-#, fuzzy
-#| msgid "the <literal>Component:</literal> line"
msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "La ligne <literal>Component:</literal>"
+msgstr "L'option <literal>APT::Color</literal> est activée."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: apt.8.xml:155
@@ -809,15 +829,17 @@ msgid ""
"A new <literal>list</literal> command is available similar to <literal>dpkg "
"--list</literal>."
msgstr ""
+"Une nouvelle commande <literal>list</literal> est disponible, semblable à la "
+"commande <literal>dpkg --list</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: apt.8.xml:160
-#, fuzzy
-#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgid ""
"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
"enabled by default."
-msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>"
+msgstr ""
+"La commande <literal>upgrade</literal> a l'option <literal>--with-new-pkgs</"
+"literal> activée par défaut."
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:170 apt-get.8.xml:560 apt-cache.8.xml:346 apt-key.8.xml:191
@@ -830,18 +852,12 @@ msgstr "Voir aussi"
#. type: Content of: <refentry><refsect1><para>
#: apt.8.xml:171
-#, fuzzy
-#| msgid ""
-#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
-#| "preferences;, the APT Howto."
msgid ""
"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
msgstr ""
-"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, le guide d'APT dans &guidesdir;, &apt-preferences;, le "
-"« HOWTO » d'APT."
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, le guide "
+"d'APT dans &guidesdir;, &apt-preferences;, le « HOWTO » d'APT."
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:176 apt-get.8.xml:566 apt-cache.8.xml:351 apt-mark.8.xml:131
@@ -852,15 +868,11 @@ msgstr "Diagnostics"
#. type: Content of: <refentry><refsect1><para>
#: apt.8.xml:177
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
-#| "on error."
msgid ""
"<command>apt</command> returns zero on normal operation, decimal 100 on "
"error."
msgstr ""
-"<command>apt-get</command> renvoie zéro après une opération normale, le "
+"<command>apt</command> renvoie zéro après une opération normale, et le "
"décimal 100 en cas d'erreur."
#. type: Content of: <refentry><refnamediv><refpurpose>
@@ -871,22 +883,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-get.8.xml:35
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> is the command-line tool for handling "
-#| "packages, and may be considered the user's \"back-end\" to other tools "
-#| "using the APT library. Several \"front-end\" interfaces exist, such as "
-#| "&dselect;, &aptitude;, &synaptic; and &wajig;."
msgid ""
"<command>apt-get</command> is the command-line tool for handling packages, "
"and may be considered the user's \"back-end\" to other tools using the APT "
"library. Several \"front-end\" interfaces exist, such as &aptitude;, "
"&synaptic; and &wajig;."
msgstr ""
-"<command>Apt-get</command> est le programme en ligne de commande pour la "
+"<command>apt-get</command> est le programme en ligne de commande pour la "
"gestion des paquets. Il peut être considéré comme l'outil de base pour les "
-"autres programmes de la bibliothèque APT. Plusieurs interfaces utilisateur "
-"existent, comme &dselect;, &aptitude;, &synaptic; and &wajig;."
+"autres programmes de la bibliothèque APT. Plusieurs interfaces utilisateur "
+"existent, comme &aptitude;, &synaptic; and &wajig;."
#. type: Content of: <refentry><refsect1><para>
#: apt-get.8.xml:40 apt-cache.8.xml:40 apt-cdrom.8.xml:47 apt-config.8.xml:40
@@ -1203,15 +1209,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:211
-#, fuzzy
-#| msgid ""
-#| "<literal>clean</literal> clears out the local repository of retrieved "
-#| "package files. It removes everything but the lock file from "
-#| "<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/"
-#| "archives/partial/</filename>. When APT is used as a &dselect; method, "
-#| "<literal>clean</literal> is run automatically. Those who do not use "
-#| "dselect will likely want to run <literal>apt-get clean</literal> from "
-#| "time to time to free up disk space."
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -1221,10 +1218,7 @@ msgstr ""
"La commande <literal>clean</literal> nettoie le référentiel local des "
"paquets récupérés. Elle supprime tout, excepté le fichier de verrou situé "
"dans <filename>&cachedir;/archives/</filename> et <filename>&cachedir;/"
-"archives/partial/</filename>. Quand APT est utilisé comme mode de "
-"&dselect;, <literal>clean</literal> est exécuté automatiquement. Quand on "
-"n'utilise pas dselect, il faut exécuter <literal>apt-get clean</literal> de "
-"temps en temps si l'on veut libérer de l'espace disque."
+"archives/partial/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:218
@@ -1310,19 +1304,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:271
-#, fuzzy
-#| msgid ""
-#| "Fix; attempt to correct a system with broken dependencies in place. This "
-#| "option, when used with install/remove, can omit any packages to permit "
-#| "APT to deduce a likely solution. If packages are specified, these have to "
-#| "completely correct the problem. The option is sometimes necessary when "
-#| "running APT for the first time; APT itself does not allow broken package "
-#| "dependencies to exist on a system. It is possible that a system's "
-#| "dependency structure can be so corrupt as to require manual intervention "
-#| "(which usually means using &dselect; or <command>dpkg --remove</command> "
-#| "to eliminate some of the offending packages). Use of this option together "
-#| "with <option>-m</option> may produce an error in some situations. "
-#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>."
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -1344,9 +1325,9 @@ msgstr ""
"interdit les dépendances défectueuses dans un système. Il est possible que "
"la structure de dépendances d'un système soit tellement corrompue qu'elle "
"requiert une intervention manuelle (ce qui veut dire la plupart du temps "
-"utiliser &dselect; ou <command>dpkg --remove</command> pour éliminer les "
-"paquets en cause). L'utilisation de cette option conjointement avec <option>-"
-"m</option> peut produire une erreur dans certaines situations. Élément de "
+"utiliser <command>dpkg --remove</command> pour éliminer les paquets en "
+"cause). L'utilisation de cette option conjointement avec <option>-m</option> "
+"peut produire une erreur dans certaines situations. Élément de "
"configuration : <literal>APT::Get::Fix-Broken</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1496,14 +1477,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:364
-#, fuzzy
-#| msgid ""
-#| "This option controls the architecture packages are built for by "
-#| "<command>apt-get source --compile</command> and how cross-"
-#| "builddependencies are satisfied. By default is it not set which means "
-#| "that the host architecture is the same as the build architecture (which "
-#| "is defined by <literal>APT::Architecture</literal>). Configuration Item: "
-#| "<literal>APT::Get::Host-Architecture</literal>"
msgid ""
"This option controls the architecture packages are built for by <command>apt-"
"get source --compile</command> and how cross-builddependencies are "
@@ -1517,19 +1490,11 @@ msgstr ""
"de construction transverses sont respectées. Elle n'est pas positionnée par "
"défaut ce qui signifie que l'architecture hôte est la même que "
"l'architecture de construction (définie par <literal>APT::Architecture</"
-"literal>). Élément de configuration : <literal>APT::Get::Host-Architecture</"
-"literal>"
+"literal>). Élément de configuration : <literal>APT::Get::Host-Architecture</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:374
-#, fuzzy
-#| msgid ""
-#| "This option controls the architecture packages are built for by "
-#| "<command>apt-get source --compile</command> and how cross-"
-#| "builddependencies are satisfied. By default is it not set which means "
-#| "that the host architecture is the same as the build architecture (which "
-#| "is defined by <literal>APT::Architecture</literal>). Configuration Item: "
-#| "<literal>APT::Get::Host-Architecture</literal>"
msgid ""
"This option controls the activated build profiles for which a source package "
"is built by <command>apt-get source --compile</command> and how build "
@@ -1537,13 +1502,12 @@ msgid ""
"than one build profile can be activated at a time by concatenating them with "
"a comma. Configuration Item: <literal>APT::Build-Profiles</literal>."
msgstr ""
-"Cette option contrôle comment les paquets d'architectures sont construits "
-"par <command>apt-get source --compile</command> et comment les dépendances "
-"de construction transverses sont respectées. Elle n'est pas positionnée par "
-"défaut ce qui signifie que l'architecture hôte est la même que "
-"l'architecture de construction (définie par <literal>APT::Architecture</"
-"literal>). Élément de configuration : <literal>APT::Get::Host-Architecture</"
-"literal>"
+"Cette option contrôle les profils de construction actifs pour lesquels un "
+"paquet source est construit par <command>apt-get source --compile</command> "
+"et comment les dépendances sont respectées. Par défaut, aucun profil de "
+"construction n'est actif. Plus d'un profil peut être activé en même temps en "
+"les concaténant par une virgule. Élément de configuration : <literal>APT::"
+"Build-Profiles</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:385
@@ -1579,6 +1543,14 @@ msgid ""
"will never remove packages, only allow adding new ones. Configuration Item: "
"<literal>APT::Get::Upgrade-Allow-New</literal>."
msgstr ""
+"Cette commande permet d'installer de nouveaux paquets lorsqu'elle est "
+"utilisée en conjonction avec la commande <literal>upgrade</literal>. C'est "
+"utile si la mise à jour d'un paquet installé exige l'installation de "
+"nouveaux paquets. Plutôt que de conserver le paquet, <literal>upgrade</"
+"literal> mettra à jour le paquet et installera les nouvelles dépendances. "
+"Remarquez que la commande <literal>upgrade</literal> avec cette option ne "
+"retirera jamais de paquets : elle ne permettra que l'ajout de nouveaux. "
+"Élément de configuration : <literal>APT::Get::Upgrade-Allow-New</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:409
@@ -1816,6 +1788,12 @@ msgid ""
"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
"literal>."
msgstr ""
+"Cette commande montre les informations de progression conviviales dans la "
+"fenêtre du terminal quand des paquets sont installés, mis à jour ou "
+"supprimés. Pour une version exploitable par une machine de ces données, voir "
+"README.progress-reporting dans le répertoire doc de apt. Élément de "
+"configuration : <literal>Dpkg::Progress</literal> et <literal>Dpkg::Progress-"
+"Fancy</literal>."
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
@@ -1825,18 +1803,13 @@ msgstr "Fichiers"
#. type: Content of: <refentry><refsect1><para>
#: apt-get.8.xml:561
-#, fuzzy
-#| msgid ""
-#| "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-#| "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
-#| "preferences;, the APT Howto."
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
"APT Howto."
msgstr ""
-"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, le guide d'APT dans &guidesdir;, &apt-preferences;, le "
+"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
+"&apt-secure;, le guide d'APT dans &guidesdir;, &apt-preferences;, le "
"« HOWTO » d'APT."
#. type: Content of: <refentry><refsect1><para>
@@ -2854,7 +2827,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:98
-#, fuzzy
msgid ""
"Once the uploaded package is verified and included in the archive, the "
"maintainer signature is stripped off, and checksums of the package are "
@@ -2871,7 +2843,8 @@ msgstr ""
"paquets est ensuite calculée et mise dans le fichier Release. Ce fichier est "
"signé par la clé de l'archive pour la version courante de la distribution et "
"distribuée en même temps que les paquets et les fichiers Packages sur les "
-"miroirs. Les clés sont fournies par le paquet &keyring-package;."
+"miroirs. Les clés sont dans le trousseau de clés de l'archive fournies par "
+"le paquet &keyring-package;."
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:109
@@ -3134,20 +3107,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:81
-#, fuzzy
-#| msgid ""
-#| "Mount point; specify the location to mount the CD-ROM. This mount point "
-#| "must be listed in <filename>/etc/fstab</filename> and properly "
-#| "configured. Configuration Item: <literal>Acquire::cdrom::mount</literal>."
msgid ""
"Do not try to auto-detect the CD-ROM path. Usually combined with the "
"<option>--cdrom</option> option. Configuration Item: <literal>Acquire::"
"cdrom::AutoDetect</literal>."
msgstr ""
-"Point de montage ; spécifie l'emplacement de montage du CD. Ce point de "
-"montage doit être spécifié dans <filename>/etc/fstab</filename> et "
-"correctement configuré. Élément de configuration : <literal>Acquire::cdrom::"
-"mount</literal>."
+"Ne pas essayer de détecter automatiquement le chemin du CD-ROM. "
+"Habituellement combiné avec l'option <option>--cdrom</option>. Élément de "
+"configuration : <literal>Acquire::cdrom::AutoDetect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:89
@@ -3462,7 +3429,7 @@ msgid ""
msgstr ""
"Le fichier de configuration est construit comme un arbre d'options "
"organisées en groupes fonctionnels. On se sert du double deux points "
-"(« :: ») pour indiquer une option ; par exemple, <literal>APT::Get::Assume-"
+"(« :: ») pour indiquer une option ; par exemple, <literal>APT::Get::Assume-"
"Yes</literal> est une option pour le groupe d'outils APT, destinée à l'outil "
"Get. Il n'y a pas d'héritage des options des groupes parents."
@@ -3706,6 +3673,11 @@ msgid ""
"is empty. The <envar>DEB_BUILD_PROFILES</envar> as used by &dpkg-"
"buildpackage; overrides the list notation."
msgstr ""
+"Liste de tous les profils de construction activés pour la résolution de "
+"dépendances de construction, sans le préfixe de l'espace de nommage du "
+"\"<literal>profile.</literal>\". Par défaut, cette liste est vide. La "
+"variable <envar>DEB_BUILD_PROFILES</envar> comme l'utilise &dpkg-"
+"buildpackage; annule la notation de liste."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:184
@@ -4151,13 +4123,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:394
-#, fuzzy
-#| msgid ""
-#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-#| "literal> which accepts integer values in kilobytes. The default value is "
-#| "0 which deactivates the limit and tries to use all available bandwidth "
-#| "(note that this option implicitly disables downloading from multiple "
-#| "servers at the same time.)"
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobytes per second. The default "
@@ -4167,9 +4132,10 @@ msgid ""
msgstr ""
"La bande passante utilisée peut être limité avec <literal>Acquire::http::Dl-"
"Limit</literal> qui peut prendre une valeur entière, l'unité utilisée étant "
-"le kilo-octet. La valeur par défaut est 0, ce qui correspond à aucune "
-"limitation de bande passante. Veuillez noter que cette option désactive "
-"implicitement le téléchargement simultané depuis plusieurs serveurs."
+"le kilo-octet par seconde. La valeur par défaut est 0, ce qui correspond à "
+"aucune limitation de bande passante. Veuillez noter que cette option "
+"désactive implicitement le téléchargement simultané depuis plusieurs "
+"serveurs."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:401
@@ -4196,6 +4162,15 @@ msgid ""
"takes precedence over the legacy option name <literal>ProxyAutoDetect</"
"literal>."
msgstr ""
+"L'option <literal>Acquire::http::Proxy-Auto-Detect</literal> peut être "
+"utilisée pour indiquer une commande externe pour découvrir le mandataire "
+"HTTP à utiliser. Apt s'attend à ce que la commande sorte le mandataire sur "
+"la sortie standard dans le style <literal>http://proxy:port/</literal>. Cela "
+"annulera le <literal>Acquire::http::Proxy</literal> générique, mais pas une "
+"configuration spécifique de mandataire hôte établie par <literal>Acquire::"
+"http::Proxy::$HOST</literal>. Voir le paquet &squid-deb-proxy-client; pour "
+"un exemple d'implémentation qui utilise avahi. Cette option l'emporte sur "
+"l'ancien nom d'option <literal>ProxyAutoDetect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:423
@@ -4643,17 +4618,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:633
-#, fuzzy
-#| msgid ""
-#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
-#| "cache information, such as the two package caches <literal>srcpkgcache</"
-#| "literal> and <literal>pkgcache</literal> as well as the location to place "
-#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
-#| "of caches can be turned off by setting their names to the empty string. "
-#| "This will slow down startup but save disk space. It is probably "
-#| "preferable to turn off the pkgcache rather than the srcpkgcache. Like "
-#| "<literal>Dir::State</literal> the default directory is contained in "
-#| "<literal>Dir::Cache</literal>"
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4669,12 +4633,13 @@ msgstr ""
"le cache local : par exemple, les deux caches de paquets "
"<literal>srcpkgcache</literal> et <literal>pkgcache</literal>, ainsi que "
"l'endroit où sont placées les archives téléchargées, <literal>Dir::Cache::"
-"archives</literal>. On peut empêcher la création des caches en saisissant un "
-"nom vide. Cela ralentit le démarrage mais économise de l'espace disque. Il "
-"vaut mieux se passer du cache <literal>pkgcache</literal> plutôt que se "
-"passer du cache <literal>srcpkgcache</literal>. Comme pour <literal>Dir::"
-"State</literal>, le répertoire par défaut est contenu dans <literal>Dir::"
-"Cache</literal>."
+"archives</literal>. On peut empêcher la création des caches en positionnant "
+"<literal>pkgcache</literal> ou <literal>srcpkgcache</literal> à la valeur "
+"<literal>\"\"</literal>. Cela ralentit le démarrage mais économise de "
+"l'espace disque. Il vaut mieux se passer du cache <literal>pkgcache</"
+"literal> plutôt que se passer du cache <literal>srcpkgcache</literal>. Comme "
+"pour <literal>Dir::State</literal>, le répertoire par défaut est contenu "
+"dans <literal>Dir::Cache</literal>."
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:643
@@ -4867,13 +4832,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:739
-#, fuzzy
-#| msgid ""
-#| "This is a list of shell commands to run before invoking &dpkg;. Like "
-#| "<literal>options</literal> this must be specified in list notation. The "
-#| "commands are invoked in order using <filename>/bin/sh</filename>; should "
-#| "any fail APT will abort. APT will pass the filenames of all .deb files it "
-#| "is going to install to the commands, one per line on standard input."
msgid ""
"This is a list of shell commands to run before invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -4884,20 +4842,14 @@ msgid ""
msgstr ""
"Il s'agit d'une liste de commandes shell à exécuter avant d'appeler &dpkg;. "
"Tout comme pour <literal>Options</literal>, on doit utiliser la notation de "
-"liste. Les commandes sont appelées dans l'ordre, en utilisant <filename>/"
-"bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue. Sur l'entrée "
-"standard, APT transmet aux commandes les noms de tous les fichiers .deb "
-"qu'il va installer, à raison d'un par ligne."
+"liste. Les commandes sont appelées dans l'ordre, en utilisant <filename>/bin/"
+"sh</filename> : APT s'arrête dès que l'une d'elles échoue. APT transmet aux "
+"commandes les noms de tous les fichiers .deb qu'il va installer, à raison "
+"d'un par ligne sur le descripteur de fichier demandé, par défaut sur "
+"l'entrée standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:746
-#, fuzzy
-#| msgid ""
-#| "Version 2 of this protocol dumps more information, including the protocol "
-#| "version, the APT configuration space and the packages, files and versions "
-#| "being changed. Version 2 is enabled by setting <literal>DPkg::Tools::"
-#| "options::cmd::Version</literal> to 2. <literal>cmd</literal> is a command "
-#| "given to <literal>Pre-Install-Pkgs</literal>."
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -4906,10 +4858,9 @@ msgid ""
msgstr ""
"La deuxième version de ce protocole donne plus de renseignements : on "
"obtient la version du protocole, la configuration de APT et les paquets, "
-"fichiers ou versions qui ont changé. On autorise cette version en "
-"positionnant <literal>DPkg::Tools::Options::cmd::Version</literal> à 2. "
-"<literal>cmd</literal> est une commande passée à <literal>Pre-Install-Pkgs</"
-"literal>."
+"fichiers ou versions qui ont changé. La troisième version ajoute "
+"l'architecture et le marqueur <literal>MultiArch</literal> à chaque version "
+"déposée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:751
@@ -4921,6 +4872,12 @@ msgid ""
"the requested version it will send the information in the highest version it "
"has support for instead."
msgstr ""
+"La version du protocole qu'il faut utiliser pour la commande "
+"<literal><replaceable>cmd</replaceable></literal> peut être choisie en "
+"réglant <literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::"
+"Version</literal> en conséquence, la version par défaut étant la première. "
+"Si APT ne gère pas la version demandée, il enverra les informations dans la "
+"version la plus haute qu'il gère."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:758
@@ -4932,6 +4889,13 @@ msgid ""
"looking for the environment variable <envar>APT_HOOK_INFO_FD</envar> which "
"contains the number of the used file descriptor as a confirmation."
msgstr ""
+"Le descripteur de fichier à utiliser pour l'envoi des informations peut être "
+"demandé avec l'option <literal>DPkg::Tools::options::<replaceable>cmd</"
+"replaceable>::InfoFD</literal> qui est par défaut <literal>0</literal> comme "
+"entrée standard ; l'option est disponible depuis la version 0.9.11. La prise "
+"en charge de l'option peut être détectée en regardant la variable "
+"d'environnement <envar>APT_HOOK_INFO_FD</envar> qui contient comme "
+"confirmation le numéro du descripteur de fichier utilisé."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:768
@@ -5507,6 +5471,9 @@ msgid ""
"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
"<literal>APT::Update::{Pre,Post}-Invoke</literal>."
msgstr ""
+"Affiche les commandes externes qui sont appelés par le point d'entrée apt. "
+"Cela inclut par exemple les options de configuration <literal>DPkg::{Pre,"
+"Post}-Invoke</literal> ou <literal>APT::Update::{Pre,Post}-Invoke</literal>."
#. type: Content of: <refentry><refsect1><title>
#: apt.conf.5.xml:1242 apt_preferences.5.xml:541 sources.list.5.xml:233
@@ -5694,7 +5661,7 @@ msgid ""
msgstr ""
"pour les versions issues d'archives dont le fichier <filename>Release</"
"filename> comporte la mention « NotAutomatic: yes » mais <emphasis>pas</"
-"emphasis> « ButAutomaticUpgrades: yes » commel'archive "
+"emphasis> « ButAutomaticUpgrades: yes » comme l'archive "
"<literal>experimental</literal> de Debian."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
@@ -5953,7 +5920,7 @@ msgstr ""
"Il est important de noter que le mot-clé utilisé ici est « <literal>origin</"
"literal> » qui peut servir à indiquer un nom d'hôte. Dans l'exemple qui "
"suit, une haute priorité est donnée à toutes les versions disponibles sur le "
-"serveur identifié par l' nom d'hôte « ftp.de.debian.org »."
+"serveur identifié par le nom d'hôte « ftp.de.debian.org »."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#: apt_preferences.5.xml:216
@@ -6989,10 +6956,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:76
-#, fuzzy, no-wrap
-#| msgid "deb [ options ] uri distribution [component1] [component2] [...]"
+#, no-wrap
msgid "deb [ options ] uri suite [component1] [component2] [...]"
-msgstr "deb [ options ] uri distribution [composant1] [composant2] [...]"
+msgstr "deb [ options ] uri suite [composant1] [composant2] [...]"
#. type: Content of: <refentry><refsect1><para><literallayout>
#: sources.list.5.xml:80
@@ -7016,6 +6982,23 @@ msgid ""
" [option1]: [option1-value]\n"
" "
msgstr ""
+" Types: deb deb-src\n"
+" URIs: http://example.com\n"
+" Suites: stable testing\n"
+" Sections: component1 component2\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+"\n"
+" Types: deb\n"
+" URIs: http://another.example.com\n"
+" Suites: experimental\n"
+" Sections: composant1 composant2\n"
+" Enabled: no\n"
+" Description: short\n"
+" long long long\n"
+" [option1]: [option1-value]\n"
+" "
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:78
@@ -7023,19 +7006,11 @@ msgid ""
"Alternatively a rfc822 style format is also supported: <placeholder type="
"\"literallayout\" id=\"0\"/>"
msgstr ""
+"Autrement, un autre format de style rfc822 est aussi géré : <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:99
-#, fuzzy
-#| msgid ""
-#| "The URI for the <literal>deb</literal> type must specify the base of the "
-#| "Debian distribution, from which APT will find the information it needs. "
-#| "<literal>distribution</literal> can specify an exact path, in which case "
-#| "the components must be omitted and <literal>distribution</literal> must "
-#| "end with a slash (<literal>/</literal>). This is useful for the case when "
-#| "only a particular sub-section of the archive denoted by the URI is of "
-#| "interest. If <literal>distribution</literal> does not specify an exact "
-#| "path, at least one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
@@ -7048,25 +7023,15 @@ msgid ""
msgstr ""
"L'URI de type <literal>deb</literal> doit indiquer la base de la "
"distribution Debian dans laquelle APT trouvera les informations dont il a "
-"besoin. <literal>distribution</literal> peut spécifier le chemin exact : "
-"dans ce cas, on doit omettre les composants et <literal>distribution</"
-"literal> doit se terminer par une barre oblique (<literal>/</literal>). "
-"C'est utile quand seule une sous-section particulière de l'archive décrite "
-"par cet URI est intéressante. Quand <literal>distribution</literal> "
-"n'indique pas un chemin exact, un <literal>composant</literal> au moins doit "
-"être présent."
+"besoin. <literal>suite</literal> peut spécifier le chemin exact : dans ce "
+"cas, on doit omettre les composants et <literal>suite</literal> doit se "
+"terminer par une barre oblique (<literal>/</literal>). C'est utile quand "
+"seule une sous-section particulière de l'archive décrite par cet URI est "
+"intéressante. Quand <literal>suite</literal> n'indique pas un chemin exact, "
+"un <literal>composant</literal> au moins doit être présent."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:108
-#, fuzzy
-#| msgid ""
-#| "<literal>distribution</literal> may also contain a variable, <literal>"
-#| "$(ARCH)</literal> which expands to the Debian architecture (such as "
-#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
-#| "This permits architecture-independent <filename>sources.list</filename> "
-#| "files to be used. In general this is only of interest when specifying an "
-#| "exact path, <literal>APT</literal> will automatically generate a URI with "
-#| "the current architecture otherwise."
msgid ""
"<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
"literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -7076,29 +7041,16 @@ msgid ""
"<literal>APT</literal> will automatically generate a URI with the current "
"architecture otherwise."
msgstr ""
-"<literal>distribution</literal> peut aussi contenir une variable <literal>"
-"$(ARCH)</literal>, qui sera remplacée par l'architecture Debian (comme "
-"<literal>amd64</literal> ou <literal>armel</literal>) sur laquelle "
-"s'exécute le système. On peut ainsi utiliser un fichier <filename>sources."
-"list</filename> qui ne dépend pas d'une architecture. En général, ce n'est "
+"<literal>suite</literal> peut aussi contenir une variable <literal>$(ARCH)</"
+"literal>, qui sera remplacée par l'architecture Debian (comme "
+"<literal>amd64</literal> ou <literal>armel</literal>) sur laquelle s'exécute "
+"le système. On peut ainsi utiliser un fichier <filename>sources.list</"
+"filename> qui ne dépend pas d'une architecture. En général, ce n'est "
"intéressant que si l'on indique un chemin exact ; sinon <literal>APT</"
"literal> crée automatiquement un URI en fonction de l'architecture effective."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:116
-#, fuzzy
-#| msgid ""
-#| "Since only one distribution can be specified per line it may be necessary "
-#| "to have multiple lines for the same URI, if a subset of all available "
-#| "distributions or components at that location is desired. APT will sort "
-#| "the URI list after it has generated a complete set internally, and will "
-#| "collapse multiple references to the same Internet host, for instance, "
-#| "into a single connection, so that it does not inefficiently establish an "
-#| "FTP connection, close it, do something else, and then re-establish a "
-#| "connection to that same host. This feature is useful for accessing busy "
-#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
-#| "also parallelizes connections to different hosts to more effectively deal "
-#| "with sites with low bandwidth."
msgid ""
"In the traditional style sources.list format since only one distribution can "
"be specified per line it may be necessary to have multiple lines for the "
@@ -7112,7 +7064,8 @@ msgid ""
"users. APT also parallelizes connections to different hosts to more "
"effectively deal with sites with low bandwidth."
msgstr ""
-"Puisqu'on ne peut indiquer qu'une seule distribution par ligne, il peut être "
+"Lorsqu'on utilise le type de style de sources.list traditionnel, 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 "
@@ -7158,24 +7111,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: sources.list.5.xml:140
-#, fuzzy
-#| msgid ""
-#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-#| "replaceable>,…</literal> can be used to specify for which architectures "
-#| "information should be downloaded. If this option is not set all "
-#| "architectures defined by the <literal>APT::Architectures</literal> option "
-#| "will be downloaded."
msgid ""
"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
"replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
"<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove "
"architectures from the set which will be downloaded."
msgstr ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> peut être utilisé pour indiquer les architectures "
-"pour lesquelles l'information doit être téléchargée. Si cette option n'est "
-"pas utilisée, toutes les architectures définies par l'option <literal>APT::"
-"Architectures</literal> sera téléchargée."
+"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> et <literal>arch-=<replaceable>arch1</replaceable>,"
+"<replaceable>arch2</replaceable>,…</literal> qui peuvent être utilisés pour "
+"ajouter ou supprimer des architectures dans l'ensemble qui sera téléchargée."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: sources.list.5.xml:143
@@ -8586,7 +8531,7 @@ msgstr "jgg@debian.org"
#. type: Content of: <book><bookinfo><releaseinfo>
#: guide.dbk:21 offline.dbk:21
msgid "Version &apt-product-version;"
-msgstr ""
+msgstr "Version &apt-product-version;"
#. type: Content of: <book><bookinfo><abstract><para>
#: guide.dbk:25
@@ -8606,7 +8551,7 @@ msgstr ""
#. type: Content of: <book><bookinfo><legalnotice><title>
#: guide.dbk:32 offline.dbk:33
msgid "License Notice"
-msgstr ""
+msgstr "Mention de licence "
#. type: Content of: <book><bookinfo><legalnotice><para>
#: guide.dbk:34 offline.dbk:35
@@ -8929,16 +8874,6 @@ msgstr ""
#. type: Content of: <book><chapter><para>
#: guide.dbk:188
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> has several command line options that are "
-#| "detailed in its man page, <manref section=\"8\" name=\"apt-get\">. The "
-#| "most useful option is <literal>-d</literal> which does not install the "
-#| "fetched files. If the system has to download a large number of package it "
-#| "would be undesired to start installing them in case something goes wrong. "
-#| "When <literal>-d</literal> is used the downloaded archives can be "
-#| "installed by simply running the command that caused them to be downloaded "
-#| "again without <literal>-d</literal>."
msgid ""
"<command>apt-get</command> has several command line options that are "
"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
@@ -8951,9 +8886,10 @@ msgid ""
"literal>."
msgstr ""
"<command>apt-get</command> fournit de nombreuses options de ligne de "
-"commande qui sont expliquées en détail dans sa page de manuel, <manref "
-"section=\"8\" name=\"apt-get\">. Une des plus utiles est l'option <literal>-"
-"d</literal> qui récupère sans les installer les fichiers nécessaires. Si le "
+"commande qui sont expliquées en détail dans sa page de manuel, "
+"<citerefentry><refentrytitle>apt-get</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>. Une des plus utiles est l'option <literal>-d</"
+"literal> qui récupère sans les installer les fichiers nécessaires. Si le "
"système a besoin de télécharger un grand nombre de paquets, il est par "
"exemple souhaitable de pouvoir simplement les récupérer sans les installer "
"immédiatement, au cas où quelque chose se passe mal. Une fois que <literal>-"
@@ -10043,7 +9979,7 @@ msgid ""
"the target machine. Take the disc back and run:"
msgstr ""
"Après cette opération, le disque contiendra tous les fichiers d'index et les "
-"archives nécessaires pour mettr eà jour la machine cible. Il est alors "
+"archives nécessaires pour mettre à jour la machine cible. Il est alors "
"possible d'y ramener le disque et exécuter :"
#. type: Content of: <book><chapter><section><screen>
diff --git a/doc/po/it.po b/doc/po/it.po
index c8c89408c..28e97f14b 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -5,13 +5,13 @@
# Eugenia Franzoni, 2000
# Hugh Hartmann, 2000-2012
# Gabriele Stilli, 2012
-# Beatrice Torracca <beatricet@libero.it>, 2012, 2014.
+# Beatrice Torracca <beatricet@libero.it>, 2012, 2014, 2015.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
-"PO-Revision-Date: 2014-07-04 00:45+0200\n"
+"POT-Creation-Date: 2015-03-10 09:48+0100\n"
+"PO-Revision-Date: 2015-01-27 14:11+0200\n"
"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
"Language: it\n"
@@ -680,7 +680,7 @@ msgstr "APT"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt.8.xml:28
msgid "command-line interface"
-msgstr ""
+msgstr "interfaccia a riga di comando"
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:33 apt-get.8.xml:34 apt-cache.8.xml:34 apt-key.8.xml:33
@@ -699,6 +699,11 @@ msgid ""
"management of the system. See also &apt-get; and &apt-cache; for more low-"
"level command options."
msgstr ""
+"<command>apt</command> (Advanced Package Tool, strumento avanzato per "
+"pacchetti) è lo strumento a riga di comando per maneggiare i pacchetti. "
+"Fornisce un'interfaccia a riga di comando per la gestione dei pacchetti del "
+"sistema. Per altre opzioni di comandi a basso livello vedere anche &apt-get; "
+"e &apt-cache;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:43
@@ -708,6 +713,10 @@ msgid ""
"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
"versions</option> are supported."
msgstr ""
+"<literal>list</literal> viene usato per visualizzare un elenco di pacchetti. "
+"Permette l'uso dei modelli di shell per la corrispondenza con nomi di "
+"pacchetto e sono gestite le seguenti opzioni: <option>--installed</option>, "
+"<option>--upgradable</option>, <option>--all-versions</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:54
@@ -715,19 +724,17 @@ msgid ""
"<literal>search</literal> searches for the given term(s) and display "
"matching packages."
msgstr ""
+"<literal>search</literal> cerca i termini specificati e visualizza i "
+"pacchetti che corrispondono."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:60
-#, fuzzy
-#| msgid ""
-#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
-#| "package has."
msgid ""
"<literal>show</literal> shows the package information for the given "
"package(s)."
msgstr ""
-"<literal>rdepends</literal> mostra un elenco di tutte le dipendenze inverse "
-"di un pacchetto."
+"<literal>show</literal> mostra le informazioni di pacchetto per i pacchetti "
+"specificati."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:67
@@ -735,6 +742,8 @@ msgid ""
"<literal>install</literal> is followed by one or more package names desired "
"for installation or upgrading."
msgstr ""
+"<literal>install</literal> è seguito da uno o più nomi di pacchetto che si "
+"desidera vengano installati o aggiornati."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:71 apt-get.8.xml:112
@@ -775,19 +784,17 @@ msgid ""
"<literal>edit-sources</literal> lets you edit your sources.list file and "
"provides basic sanity checks."
msgstr ""
+"<literal>edit-sources</literal> permette di modificare il proprio file "
+"sources.list e fornisce controlli di sanità di base."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:95
-#, fuzzy
-#| msgid ""
-#| "<literal>showhold</literal> is used to print a list of packages on hold "
-#| "in the same way as for the other show commands."
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources."
msgstr ""
-"<literal>showhold</literal> viene usato per stampare un elenco di pacchetti "
-"bloccati in modo uguale a ciò che fanno gli altri comandi «show»."
+"<literal>update</literal> viene usato per risincronizzare i file con gli "
+"indici dei pacchetti con le loro fonti."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:101
@@ -797,6 +804,10 @@ msgid ""
"<filename>/etc/apt/sources.list</filename>. New packages will be installed, "
"but existing packages will never be removed."
msgstr ""
+"<literal>upgrade</literal> viene usato per installare le versioni più "
+"recenti di tutti i pacchetti attualmente installati nel sistema prendendoli "
+"dalle fonti elencate in <filename>/etc/apt/sources.list</filename>. Nuovi "
+"pacchetti verranno installati, ma quelli esistenti non saranno mai rimossi."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.8.xml:110
@@ -805,6 +816,9 @@ msgid ""
"also remove installed packages if that is required in order to resolve a "
"package conflict."
msgstr ""
+"<literal>full-upgrade</literal> effettua la funzione di aggiornamento ma può "
+"anche rimuovere i pacchetti installati se ciò è necessario per poter "
+"risolvere un conflitto tra pacchetti."
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104
@@ -816,7 +830,7 @@ msgstr "opzioni"
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:130
msgid "Script usage"
-msgstr ""
+msgstr "Uso di script"
#. type: Content of: <refentry><refsect1><para>
#: apt.8.xml:132
@@ -827,11 +841,17 @@ msgid ""
"&apt-cache; and &apt-get; via APT options. Please prefer using these "
"commands in your scripts."
msgstr ""
+"La riga di comando di &apt; è progettata come strumento per l'utente finale "
+"e il suo output può cambiare da una versione ad un'altra. Sebbene si cerchi "
+"di non rompere la compatibilità all'indietro, questa però non è garantita. "
+"Tutte le funzionalità di &apt; sono disponibili in &apt-cache; e &apt-get; "
+"attraverso opzioni APT. Si raccomando di preferire l'uso di questi comandi "
+"negli script."
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:140
msgid "Differences to &apt-get;"
-msgstr ""
+msgstr "Differenze con &apt-get;"
#. type: Content of: <refentry><refsect1><para>
#: apt.8.xml:141
@@ -840,20 +860,19 @@ msgid ""
"does not need to be backward compatible like &apt-get;. Therefore some "
"options are different:"
msgstr ""
+"Il comando <command>apt</command> non è pensato per essere facile da usare "
+"per gli utenti finali e non è necessario sia compatibile all'indietro come "
+"&apt-get;. Perciò alcune opzioni sono diverse:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: apt.8.xml:147
-#, fuzzy
-#| msgid "the <literal>Package:</literal> line"
msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
-msgstr "la riga <literal>Package:</literal>"
+msgstr "L'opzione <literal>DPkg::Progress-Fancy</literal> è abilitata."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: apt.8.xml:151
-#, fuzzy
-#| msgid "the <literal>Component:</literal> line"
msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "la riga<literal>Component:</literal>"
+msgstr "L'opzione <literal>APT::Color</literal> è abilitata."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: apt.8.xml:155
@@ -861,15 +880,17 @@ msgid ""
"A new <literal>list</literal> command is available similar to <literal>dpkg "
"--list</literal>."
msgstr ""
+"È disponibile un nuovo comando <literal>list</literal> simile a "
+"<literal>dpkg --list</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: apt.8.xml:160
-#, fuzzy
-#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgid ""
"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
"enabled by default."
-msgstr "la riga <literal>Archive:</literal> o <literal>Suite:</literal>"
+msgstr ""
+"L'opzione <literal>upgrade</literal> ha <literal>--with-new-pkgs</literal> "
+"abilitato in modo predefinito."
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:170 apt-get.8.xml:560 apt-cache.8.xml:346 apt-key.8.xml:191
@@ -882,18 +903,12 @@ msgstr "Vedere anche"
#. type: Content of: <refentry><refsect1><para>
#: apt.8.xml:171
-#, fuzzy
-#| msgid ""
-#| "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-"
-#| "config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
-#| "preferences;, the APT Howto."
msgid ""
"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
msgstr ""
-"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
-"&apt-secure;, la guida dell'utente di APT in &guidesdir;, &apt-preferences;, "
-"l'APT Howto."
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, la Guida "
+"dell'utente di APT in &guidesdir;, &apt-preferences;, l'APT Howto."
#. type: Content of: <refentry><refsect1><title>
#: apt.8.xml:176 apt-get.8.xml:566 apt-cache.8.xml:351 apt-mark.8.xml:131
@@ -904,16 +919,12 @@ msgstr "Diagnostica"
#. type: Content of: <refentry><refsect1><para>
#: apt.8.xml:177
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
-#| "on error."
msgid ""
"<command>apt</command> returns zero on normal operation, decimal 100 on "
"error."
msgstr ""
-"<command>apt-get</command> restituisce zero in caso di funzionamento normale "
-"e il valore decimale 100 in caso di errore."
+"<command>apt</command> restituisce zero in caso di funzionamento normale e "
+"il valore decimale 100 in caso di errore."
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-get.8.xml:29
@@ -1811,13 +1822,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:537
-#, fuzzy
-#| msgid ""
-#| "Show user friendly progress information in the terminal window when "
-#| "packages are installed, upgraded or removed. For a machine parsable "
-#| "version of this data see README.progress-reporting in the apt doc "
-#| "directory. Configuration Item: <literal>DpkgPM::Progress</literal> and "
-#| "<literal>Dpkg::Progress-Fancy</literal>."
msgid ""
"Show user friendly progress information in the terminal window when packages "
"are installed, upgraded or removed. For a machine parsable version of this "
@@ -1829,8 +1833,8 @@ msgstr ""
"terminale quando i pacchetti sono installati, aggiornati o rimossi. Per una "
"versione analizzabile da macchina di questi dati, vedere README.progress-"
"reporting nella directory della documentazione di apt. Voce di "
-"configurazione: <literal>DpkgPM::Progress</literal> e <literal>Dpkg::"
-"Progress-Fancy</literal>."
+"configurazione: <literal>Dpkg::Progress</literal> e <literal>Dpkg::Progress-"
+"Fancy</literal>."
#. type: Content of: <refentry><refsect1><title>
#: apt-get.8.xml:550 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121
@@ -4638,17 +4642,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:633
-#, fuzzy
-#| msgid ""
-#| "<literal>Dir::Cache</literal> contains locations pertaining to local "
-#| "cache information, such as the two package caches <literal>srcpkgcache</"
-#| "literal> and <literal>pkgcache</literal> as well as the location to place "
-#| "downloaded archives, <literal>Dir::Cache::archives</literal>. Generation "
-#| "of caches can be turned off by setting their names to the empty string. "
-#| "This will slow down startup but save disk space. It is probably "
-#| "preferable to turn off the pkgcache rather than the srcpkgcache. Like "
-#| "<literal>Dir::State</literal> the default directory is contained in "
-#| "<literal>Dir::Cache</literal>"
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4665,10 +4658,11 @@ msgstr ""
"<literal>srcpkgcache</literal> e <literal>pkgcache</literal>, così come la "
"posizione in cui mettere gli archivi scaricati: <literal>Dir::Cache::"
"archives</literal>. La generazione delle cache può essere disattivata "
-"impostando il loro nome ad una stringa vuota. Questo rallenta l'avvio ma fa "
-"risparmiare spazio su disco. È probabilmente preferibile disattivare "
-"pkgcache piuttosto che srcpkgcache. Come per <literal>Dir::State</literal>, "
-"la directory predefinita è contenuta in <literal>Dir::Cache</literal>"
+"impostando <literal>pkgcache</literal> o <literal>srcpkgcache</literal> a "
+"<literal>\"\"</literal>. Questo rallenta l'avvio ma fa risparmiare spazio su "
+"disco. È probabilmente preferibile disattivare pkgcache piuttosto che "
+"srcpkgcache. Come per <literal>Dir::State</literal>, la directory "
+"predefinita è contenuta in <literal>Dir::Cache</literal>"
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:643
@@ -5492,6 +5486,9 @@ msgid ""
"g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
"<literal>APT::Update::{Pre,Post}-Invoke</literal>."
msgstr ""
+"Visualizza i comandi esterni che sono richiamati dagli hook di apt. Ciò "
+"include ad esempio le opzioni di configurazione <literal>DPkg::{Pre,Post}-"
+"Invoke</literal> o <literal>APT::Update::{Pre,Post}-Invoke</literal>."
#. type: Content of: <refentry><refsect1><title>
#: apt.conf.5.xml:1242 apt_preferences.5.xml:541 sources.list.5.xml:233
@@ -8559,7 +8556,7 @@ msgstr "jgg@debian.org"
#. type: Content of: <book><bookinfo><releaseinfo>
#: guide.dbk:21 offline.dbk:21
msgid "Version &apt-product-version;"
-msgstr ""
+msgstr "Versione &apt-product-version;"
#. type: Content of: <book><bookinfo><abstract><para>
#: guide.dbk:25
@@ -8579,7 +8576,7 @@ msgstr ""
#. type: Content of: <book><bookinfo><legalnotice><title>
#: guide.dbk:32 offline.dbk:33
msgid "License Notice"
-msgstr ""
+msgstr "Licenza"
#. type: Content of: <book><bookinfo><legalnotice><para>
#: guide.dbk:34 offline.dbk:35
@@ -8888,16 +8885,6 @@ msgstr ""
#. type: Content of: <book><chapter><para>
#: guide.dbk:188
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> has several command line options that are "
-#| "detailed in its man page, <manref section=\"8\" name=\"apt-get\">. The "
-#| "most useful option is <literal>-d</literal> which does not install the "
-#| "fetched files. If the system has to download a large number of package it "
-#| "would be undesired to start installing them in case something goes wrong. "
-#| "When <literal>-d</literal> is used the downloaded archives can be "
-#| "installed by simply running the command that caused them to be downloaded "
-#| "again without <literal>-d</literal>."
msgid ""
"<command>apt-get</command> has several command line options that are "
"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
@@ -8910,13 +8897,14 @@ msgid ""
"literal>."
msgstr ""
"<command>apt-get</command> ha diverse opzioni per la riga di comando, che "
-"sono documentate dettagliatamente nella sua pagina di manuale, <manref "
-"section=\"8\" name=\"apt-get\">. L'opzione più utile è <literal>-d</"
-"literal>, che non installa i file scaricati; se il sistema deve scaricare un "
-"gran numero di pacchetti, non è bene iniziare ad installarli nel caso "
-"qualcosa dovesse andare storto. Quando si usa <literal>-d</literal>, gli "
-"archivi scaricati possono essere installati semplicemente eseguendo di nuovo "
-"lo stesso comando senza l'opzione <literal>-d</literal>."
+"sono documentate dettagliatamente nella sua pagina di manuale, "
+"<citerefentry><refentrytitle>apt-get</refentrytitle><manvolnum>8</"
+"manvolnum></citerefentry>. L'opzione più utile è <literal>-d</literal>, che "
+"non installa i file scaricati; se il sistema deve scaricare un gran numero "
+"di pacchetti, non è bene iniziare ad installarli nel caso qualcosa dovesse "
+"andare storto. Quando si usa <literal>-d</literal>, gli archivi scaricati "
+"possono essere installati semplicemente eseguendo di nuovo lo stesso comando "
+"senza l'opzione <literal>-d</literal>."
#. type: Content of: <book><chapter><title>
#: guide.dbk:200
@@ -9127,20 +9115,12 @@ msgid ""
"to <command>apt-get</command>. The method actually provides more "
"functionality than is present in <command>apt-get</command> alone."
msgstr ""
+"Il metodo <command>dselect</command> è in effetti un insieme di script "
+"wrapper per <command>apt-get</command>. Il metodo fornisce di fatto più "
+"funzionalità di quanto siano presenti nel solo <command>apt-get</command>."
#. type: Content of: <book><chapter><para>
#: guide.dbk:291
-#, fuzzy
-#| msgid ""
-#| "Both that APT <command>dselect</command> method and <command>apt-get</"
-#| "command> share the same interface. It is a simple system that generally "
-#| "tells you what it will do and then goes and does it. <footnote><para>The "
-#| "<command>dselect</command> method actually is a set of wrapper scripts to "
-#| "<command>apt-get</command>. The method actually provides more "
-#| "functionality than is present in <command>apt-get</command> alone.</"
-#| "para></footnote> After printing out a summary of what will happen APT "
-#| "then will print out some informative status messages so that you can "
-#| "estimate how far along it is and how much is left to do."
msgid ""
"Both that APT <command>dselect</command> method and <command>apt-get</"
"command> share the same interface. It is a simple system that generally "
@@ -9151,13 +9131,11 @@ msgid ""
msgstr ""
"Sia il metodo APT per <command>dselect</command> sia <command>apt-get</"
"command> condividono la stessa interfaccia; si tratta di un sistema semplice "
-"che indica in genere cosa sta per fare, e poi lo fa. <footnote><para>Il "
-"metodo <command>dselect</command> è in realtà un insieme di script di "
-"wrapper per <command>apt-get</command>. Il metodo di fatto fornisce delle "
-"funzionalità maggiori del solo <command>apt-get</command>.</para></footnote> "
-"Dopo la stampa di un riassunto delle operazioni che saranno fatte, APT "
-"stampa dei messaggi informativi sullo stato, in modo da poter avere un'idea "
-"del punto a cui arrivato e di quanto ci sia ancora da fare."
+"che indica in genere cosa sta per fare, e poi lo fa.<placeholder type="
+"\"footnote\" id=\"0\"/> Dopo la stampa di un riassunto delle operazioni che "
+"saranno fatte, APT stampa dei messaggi informativi sullo stato, in modo da "
+"poter avere un'idea del punto a cui arrivato e di quanto ci sia ancora da "
+"fare."
#. type: Content of: <book><chapter><section><title>
#: guide.dbk:302
@@ -9274,18 +9252,11 @@ msgid ""
"APT however considers all known dependencies and attempts to prevent broken "
"packages"
msgstr ""
+"APT tuttavia considera tutte le dipendenze note e cerca di evitare che i "
+"pacchetti siano difettosi."
#. type: Content of: <book><chapter><section><para>
#: guide.dbk:351
-#, fuzzy
-#| msgid ""
-#| "There are two ways a system can get into a broken state like this. The "
-#| "first is caused by <command>dpkg</command> missing some subtle "
-#| "relationships between packages when performing upgrades. "
-#| "<footnote><para>APT however considers all known dependencies and attempts "
-#| "to prevent broken packages</para></footnote>. The second is if a package "
-#| "installation fails during an operation. In this situation a package may "
-#| "have been unpacked without its dependents being installed."
msgid ""
"There are two ways a system can get into a broken state like this. The first "
"is caused by <command>dpkg</command> missing some subtle relationships "
@@ -9296,12 +9267,11 @@ msgid ""
msgstr ""
"Ci sono due modi in cui un sistema può arrivare in uno stato problematico di "
"questo genere: il primo avviene se <command>dpkg</command> non ha ravvisato "
-"alcune relazioni delicate tra i pacchetti durante un aggiornamento. "
-"<footnote><para>APT invece considera tutte le dipendenze note e cerca di "
-"evitare la presenza di pacchetti difettosi.</para></footnote> Il secondo è "
-"possibile se l'installazione di un pacchetto fallisce; in questo caso è "
-"possibile che un pacchetto venga scompattato senza che tutti quelli da cui "
-"dipende siano stati installati."
+"alcune relazioni delicate tra i pacchetti durante un aggiornamento."
+"<placeholder type=\"footnote\" id=\"0\"/> Il secondo è possibile se "
+"l'installazione di un pacchetto fallisce; in questo caso è possibile che un "
+"pacchetto venga scompattato senza che tutti quelli da cui dipende siano "
+"stati installati."
#. type: Content of: <book><chapter><section><para>
#: guide.dbk:360
@@ -9758,6 +9728,7 @@ msgstr ""
msgid ""
"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
msgstr ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
#. type: Content of: <book><chapter><title>
#: offline.dbk:48
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index ebf99a8f8..62108f7ca 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -19,6 +19,9 @@
#include <apt-pkg/init.h>
#include <apt-pkg/fileutl.h>
+#include <apt-private/private-cmndline.h>
+#include <apt-private/private-output.h>
+
#include <algorithm>
#include <climits>
#include <sys/time.h>
@@ -40,11 +43,7 @@
#include <apti18n.h>
/*}}}*/
-using namespace std;
-ostream c0out(0);
-ostream c1out(0);
-ostream c2out(0);
-ofstream devnull("/dev/null");
+using namespace std;
unsigned Quiet = 0;
// struct PackageMap - List of all package files in the config file /*{{{*/
@@ -179,7 +178,9 @@ bool PackageMap::GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats)
PkgDone = true;
// Create a package writer object.
- PackagesWriter Packages(flCombine(CacheDir,BinCacheDB),
+ MultiCompress Comp(flCombine(ArchiveDir,PkgFile),
+ PkgCompress,Permissions);
+ PackagesWriter Packages(&Comp.Input, flCombine(CacheDir,BinCacheDB),
flCombine(OverrideDir,BinOverride),
flCombine(OverrideDir,ExtraOverride),
Arch);
@@ -198,10 +199,6 @@ bool PackageMap::GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats)
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());
@@ -273,7 +270,9 @@ bool PackageMap::GenSources(Configuration &Setup,struct CacheDB::Stats &Stats)
SrcDone = true;
// Create a package writer object.
- SourcesWriter Sources(flCombine(CacheDir, SrcCacheDB),
+ MultiCompress Comp(flCombine(ArchiveDir,SrcFile),
+ SrcCompress,Permissions);
+ SourcesWriter Sources(&Comp.Input, flCombine(CacheDir, SrcCacheDB),
flCombine(OverrideDir,BinOverride),
flCombine(OverrideDir,SrcOverride),
flCombine(OverrideDir,SrcExtraOverride));
@@ -288,11 +287,7 @@ bool PackageMap::GenSources(Configuration &Setup,struct CacheDB::Stats &Stats)
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());
@@ -366,16 +361,15 @@ bool PackageMap::GenContents(Configuration &Setup,
gettimeofday(&StartTime,0);
// Create a package writer object.
- ContentsWriter Contents("", Arch);
+ MultiCompress Comp(flCombine(ArchiveDir,this->Contents),
+ CntCompress,Permissions);
+ Comp.UpdateMTime = Setup.FindI("Default::ContentsAge",10)*24*60*60;
+ ContentsWriter Contents(&Comp.Input, "", Arch);
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;
@@ -385,7 +379,7 @@ bool PackageMap::GenContents(Configuration &Setup,
FileFd Head(flCombine(OverrideDir,ContentsHead),FileFd::ReadOnly);
if (_error->PendingError() == true)
return false;
-
+
unsigned long long Size = Head.Size();
unsigned char Buf[4096];
while (Size != 0)
@@ -393,17 +387,17 @@ bool PackageMap::GenContents(Configuration &Setup,
unsigned long 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)
+
+ if (Comp.Input.Write(Buf, ToRead) == false)
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 */
@@ -617,8 +611,7 @@ static void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
/* */
static bool ShowHelp(CommandLine &)
{
- ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
- COMMON_ARCH,__DATE__,__TIME__);
+ ioprintf(cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
if (_config->FindB("version") == true)
return true;
@@ -678,7 +671,7 @@ static bool SimpleGenPackages(CommandLine &CmdL)
Override = CmdL.FileList[2];
// Create a package writer object.
- PackagesWriter Packages(_config->Find("APT::FTPArchive::DB"),
+ PackagesWriter Packages(NULL, _config->Find("APT::FTPArchive::DB"),
Override, "", _config->Find("APT::FTPArchive::Architecture"));
if (_error->PendingError() == true)
return false;
@@ -706,7 +699,7 @@ static bool SimpleGenContents(CommandLine &CmdL)
return ShowHelp(CmdL);
// Create a package writer object.
- ContentsWriter Contents(_config->Find("APT::FTPArchive::DB"), _config->Find("APT::FTPArchive::Architecture"));
+ ContentsWriter Contents(NULL, _config->Find("APT::FTPArchive::DB"), _config->Find("APT::FTPArchive::Architecture"));
if (_error->PendingError() == true)
return false;
@@ -739,7 +732,7 @@ static bool SimpleGenSources(CommandLine &CmdL)
SOverride.c_str());
// Create a package writer object.
- SourcesWriter Sources(_config->Find("APT::FTPArchive::DB"),Override,SOverride);
+ SourcesWriter Sources(NULL, _config->Find("APT::FTPArchive::DB"),Override,SOverride);
if (_error->PendingError() == true)
return false;
@@ -766,7 +759,7 @@ static bool SimpleGenRelease(CommandLine &CmdL)
string Dir = CmdL.FileList[1];
- ReleaseWriter Release("");
+ ReleaseWriter Release(NULL, "");
Release.DirStrip = Dir;
if (_error->PendingError() == true)
@@ -1060,31 +1053,12 @@ int main(int argc, const char *argv[])
// Parse the command line and initialize the package library
CommandLine CmdL(Args,_config);
- if (pkgInitConfig(*_config) == false || 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());
+ ParseCommandLine(CmdL, Cmds, Args, &_config, NULL, argc, argv, ShowHelp);
+
+ _config->CndSet("quiet",0);
Quiet = _config->FindI("quiet",0);
- if (Quiet > 0)
- c0out.rdbuf(devnull.rdbuf());
- if (Quiet > 1)
- c1out.rdbuf(devnull.rdbuf());
-
+ InitOutput(clog.rdbuf());
+
// Match the operation
CmdL.DispatchArg(Cmds);
diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index df5eb1451..cc3527ea4 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -322,12 +322,12 @@ bool CacheDB::LoadSource() /*{{{*/
if (Dsc.Read(FileName) == false)
return false;
- if (Dsc.Data == 0)
+ if (Dsc.Length == 0)
return _error->Error(_("Failed to read .dsc"));
-
+
// Write back the control information
InitQuerySource();
- if (Put(Dsc.Data, Dsc.Length) == true)
+ if (Put(Dsc.Data.c_str(), Dsc.Length) == true)
CurStat.Flags |= FlSource;
return true;
@@ -441,8 +441,8 @@ bool CacheDB::GetHashes(bool const GenOnly, unsigned int const DoHashes)
if (OpenFile() == false)
return false;
- Hashes hashes;
- if (Fd->Seek(0) == false || hashes.AddFD(*Fd, CurStat.FileSize, FlHashes) == false)
+ Hashes hashes(FlHashes);
+ if (Fd->Seek(0) == false || hashes.AddFD(*Fd, CurStat.FileSize) == false)
return false;
HashStringList hl = hashes.GetHashStringList();
diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index 8c4181eda..145f3910e 100644
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -38,6 +38,7 @@
#include <apt-pkg/debfile.h>
#include <apt-pkg/dirstream.h>
#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
#include <stdio.h>
#include <stdlib.h>
@@ -238,19 +239,19 @@ void GenContents::Add(const char *Dir,const char *Package)
// GenContents::WriteSpace - Write a given number of white space chars /*{{{*/
// ---------------------------------------------------------------------
/* We mod 8 it and write tabs where possible. */
-void GenContents::WriteSpace(FILE *Out,unsigned int Current,unsigned int Target)
+void GenContents::WriteSpace(std::string &out, size_t Current, size_t Target)
{
if (Target <= Current)
Target = Current + 1;
-
+
/* Now we write tabs so long as the next tab stop would not pass
the target */
for (; (Current/8 + 1)*8 < Target; Current = (Current/8 + 1)*8)
- fputc('\t',Out);
+ out.append("\t");
// Fill the last bit with spaces
for (; Current < Target; Current++)
- fputc(' ',Out);
+ out.append(" ");
}
/*}}}*/
// GenContents::Print - Display the tree /*{{{*/
@@ -259,13 +260,13 @@ void GenContents::WriteSpace(FILE *Out,unsigned int Current,unsigned int Target)
calls itself and runs over each section of the tree printing out
the pathname and the hit packages. We use Buf to build the pathname
summed over all the directory parents of this node. */
-void GenContents::Print(FILE *Out)
+void GenContents::Print(FileFd &Out)
{
char Buffer[1024];
Buffer[0] = 0;
DoPrint(Out,&Root,Buffer);
}
-void GenContents::DoPrint(FILE *Out,GenContents::Node *Top, char *Buf)
+void GenContents::DoPrint(FileFd &Out,GenContents::Node *Top, char *Buf)
{
if (Top == 0)
return;
@@ -278,26 +279,27 @@ void GenContents::DoPrint(FILE *Out,GenContents::Node *Top, char *Buf)
if (Top->Path != 0)
{
strcat(Buf,Top->Path);
-
+
// Do not show the item if it is a directory with dups
if (Top->Path[strlen(Top->Path)-1] != '/' /*|| Top->Dups == 0*/)
{
- fputs(Buf,Out);
- WriteSpace(Out,strlen(Buf),60);
+ std::string out = Buf;
+ WriteSpace(out, out.length(), 60);
for (Node *I = Top; I != 0; I = I->Dups)
{
if (I != Top)
- fputc(',',Out);
- fputs(I->Package,Out);
+ out.append(",");
+ out.append(I->Package);
}
- fputc('\n',Out);
- }
- }
-
+ out.append("\n");
+ Out.Write(out.c_str(), out.length());
+ }
+ }
+
// Go along the directory link
DoPrint(Out,Top->DirDown,Buf);
*OldEnd = 0;
-
+
// Go right
DoPrint(Out,Top->BTreeRight,Buf);
}
diff --git a/ftparchive/contents.h b/ftparchive/contents.h
index f58e3278e..953d0d54b 100644
--- a/ftparchive/contents.h
+++ b/ftparchive/contents.h
@@ -17,6 +17,7 @@
#include <string>
class debDebFile;
+class FileFd;
class GenContents
{
@@ -54,14 +55,14 @@ class GenContents
unsigned long NodeLeft;
Node *Grab(Node *Top,const char *Name,const char *Package);
- void WriteSpace(FILE *Out,unsigned int Current,unsigned int Target);
- void DoPrint(FILE *Out,Node *Top, char *Buf);
+ void WriteSpace(std::string &out, size_t Current, size_t Target);
+ void DoPrint(FileFd &Out,Node *Top, char *Buf);
public:
char *Mystrdup(const char *From);
void Add(const char *Dir,const char *Package);
- void Print(FILE *Out);
+ void Print(FileFd &Out);
GenContents() : BlockList(0), StrPool(0), StrLeft(0),
NodePool(0), NodeLeft(0) {};
diff --git a/ftparchive/makefile b/ftparchive/makefile
index d1ffe182a..e67272e1e 100644
--- a/ftparchive/makefile
+++ b/ftparchive/makefile
@@ -9,8 +9,8 @@ include ../buildlib/defaults.mak
ifdef BDBLIB
APT_DOMAIN:=apt-utils
PROGRAM=apt-ftparchive
-SLIBS = -lapt-pkg -lapt-inst $(BDBLIB) $(INTLLIBS)
-LIB_MAKES = apt-pkg/makefile apt-inst/makefile
+SLIBS = -lapt-pkg -lapt-inst -lapt-private $(BDBLIB) $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile apt-inst/makefile apt-private/makefile
SOURCE = apt-ftparchive.cc cachedb.cc writer.cc contents.cc override.cc \
multicompress.cc sources.cc
include $(PROGRAM_H)
diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc
index f35d5304a..08a3cff5a 100644
--- a/ftparchive/multicompress.cc
+++ b/ftparchive/multicompress.cc
@@ -46,7 +46,6 @@ MultiCompress::MultiCompress(string const &Output,string const &Compress,
{
Outputs = 0;
Outputter = -1;
- Input = 0;
UpdateMTime = 0;
/* Parse the compression string, a space separated lists of compresison
@@ -187,12 +186,11 @@ bool MultiCompress::Start()
};
close(Pipe[0]);
- Input = fdopen(Pipe[1],"w");
- if (Input == 0)
- return _error->Errno("fdopen",_("Failed to create FILE*"));
-
+ if (Input.OpenDescriptor(Pipe[1], FileFd::WriteOnly, true) == false)
+ return false;
+
if (Outputter == -1)
- return _error->Errno("fork",_("Failed to fork"));
+ return _error->Errno("fork",_("Failed to fork"));
return true;
}
/*}}}*/
@@ -201,11 +199,10 @@ bool MultiCompress::Start()
/* */
bool MultiCompress::Die()
{
- if (Input == 0)
+ if (Input.IsOpen() == false)
return true;
-
- fclose(Input);
- Input = 0;
+
+ Input.Close();
bool Res = ExecWait(Outputter,_("Compress child"),false);
Outputter = -1;
return Res;
@@ -217,7 +214,7 @@ bool MultiCompress::Die()
bool MultiCompress::Finalize(unsigned long long &OutSize)
{
OutSize = 0;
- if (Input == 0 || Die() == false)
+ if (Input.IsOpen() == false || Die() == false)
return false;
time_t Now;
diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h
index ddd1815a3..161716b86 100644
--- a/ftparchive/multicompress.h
+++ b/ftparchive/multicompress.h
@@ -48,7 +48,7 @@ class MultiCompress
public:
// The FD to write to for compression.
- FILE *Input;
+ FileFd Input;
unsigned long UpdateMTime;
bool Finalize(unsigned long long &OutSize);
diff --git a/ftparchive/sources.cc b/ftparchive/sources.cc
index d0878a70a..ab976b490 100644
--- a/ftparchive/sources.cc
+++ b/ftparchive/sources.cc
@@ -1,5 +1,5 @@
#include <string>
-#include <iostream>
+#include <sstream>
// for memcpy
#include <cstring>
@@ -9,17 +9,19 @@
#include "sources.h"
-bool DscExtract::TakeDsc(const void *newData, unsigned long newSize)
+bool DscExtract::TakeDsc(const void *newData, unsigned long long newSize)
{
- if(newSize > maxSize)
- return _error->Error("DSC data is too large %lu!", newSize);
-
if (newSize == 0)
{
+ // adding two newlines 'off record' for pkgTagSection.Scan() calls
+ Data = "\n\n";
Length = 0;
return true;
}
- memcpy(Data, newData, newSize);
+
+ Data = std::string((const char*)newData, newSize);
+ // adding two newlines 'off record' for pkgTagSection.Scan() calls
+ Data.append("\n\n");
Length = newSize;
return true;
@@ -27,20 +29,31 @@ bool DscExtract::TakeDsc(const void *newData, unsigned long newSize)
bool DscExtract::Read(std::string FileName)
{
+ Data.clear();
+ Length = 0;
+
FileFd F;
if (OpenMaybeClearSignedFile(FileName, F) == false)
return false;
-
- unsigned long long const FSize = F.FileSize();
- if(FSize > maxSize)
- return _error->Error("DSC file '%s' is too large!",FileName.c_str());
-
- if (F.Read(Data, FSize) == false)
- return false;
- Length = FSize;
IsClearSigned = (FileName != F.Name());
+ std::ostringstream data;
+ char buffer[1024];
+ do {
+ unsigned long long actual = 0;
+ if (F.Read(buffer, sizeof(buffer)-1, &actual) == false)
+ return _error->Errno("read", "Failed to read dsc file %s", FileName.c_str());
+ if (actual == 0)
+ break;
+ Length += actual;
+ buffer[actual] = '\0';
+ data << buffer;
+ } while(true);
+
+ // adding two newlines 'off record' for pkgTagSection.Scan() calls
+ data << "\n\n";
+ Data = data.str();
return true;
}
diff --git a/ftparchive/sources.h b/ftparchive/sources.h
index 9ada15728..a125ec6a4 100644
--- a/ftparchive/sources.h
+++ b/ftparchive/sources.h
@@ -3,29 +3,21 @@
#include <apt-pkg/tagfile.h>
-class DscExtract
+#include <string>
+
+class DscExtract
{
public:
- //FIXME: do we really need to enforce a maximum size of the dsc file?
- static const int maxSize = 128*1024;
-
- char *Data;
+ std::string Data;
pkgTagSection Section;
- unsigned long Length;
+ unsigned long long Length;
bool IsClearSigned;
- bool TakeDsc(const void *Data, unsigned long Size);
+ bool TakeDsc(const void *Data, unsigned long long Size);
bool Read(std::string FileName);
-
- DscExtract() : Data(0), Length(0), IsClearSigned(false) {
- Data = new char[maxSize];
- };
- ~DscExtract() {
- if(Data != NULL) {
- delete [] Data;
- Data = NULL;
- }
- };
+
+ DscExtract() : Length(0), IsClearSigned(false) {};
+ ~DscExtract() {};
};
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index ded8715f8..7cf7e6efc 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -51,20 +51,6 @@
using namespace std;
FTWScanner *FTWScanner::Owner;
-// SetTFRewriteData - Helper for setting rewrite lists /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static inline TFRewriteData SetTFRewriteData(const char *tag,
- const char *rewrite,
- const char *newtag = 0)
-{
- TFRewriteData tfrd;
- tfrd.Tag = tag;
- tfrd.Rewrite = rewrite;
- tfrd.NewTag = newtag;
- return tfrd;
-}
- /*}}}*/
// ConfigToDoHashes - which hashes to generate /*{{{*/
static void SingleConfigToDoHashes(unsigned int &DoHashes, std::string const &Conf, unsigned int const Flag)
{
@@ -85,8 +71,15 @@ static void ConfigToDoHashes(unsigned int &DoHashes, std::string const &Conf)
// FTWScanner::FTWScanner - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-FTWScanner::FTWScanner(string const &Arch): Arch(Arch), DoHashes(~0)
+FTWScanner::FTWScanner(FileFd * const GivenOutput, string const &Arch): Arch(Arch), DoHashes(~0)
{
+ if (GivenOutput == NULL)
+ {
+ Output = new FileFd;
+ Output->OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly, false);
+ }
+ else
+ Output = GivenOutput;
ErrorPrinted = false;
NoLinkAct = !_config->FindB("APT::FTPArchive::DeLinkAct",true);
ConfigToDoHashes(DoHashes, "APT::FTPArchive");
@@ -331,11 +324,10 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath,
// PackagesWriter::PackagesWriter - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-PackagesWriter::PackagesWriter(string const &DB,string const &Overrides,string const &ExtOverrides,
+PackagesWriter::PackagesWriter(FileFd * const GivenOutput, string const &DB,string const &Overrides,string const &ExtOverrides,
string const &Arch) :
- FTWScanner(Arch), Db(DB), Stats(Db.Stats), TransWriter(NULL)
+ FTWScanner(GivenOutput, Arch), Db(DB), Stats(Db.Stats), TransWriter(NULL)
{
- Output = stdout;
SetExts(".deb .udeb");
DeLinkLimit = 0;
@@ -440,9 +432,6 @@ bool PackagesWriter::DoPackage(string FileName)
OverItem->Priority = Tags.FindS("Priority");
}
- char Size[40];
- sprintf(Size,"%llu", (unsigned long long) FileSize);
-
// Strip the DirStrip prefix from the FileName and add the PathPrefix
string NewFileName;
if (DirStrip.empty() == false &&
@@ -464,29 +453,32 @@ bool PackagesWriter::DoPackage(string FileName)
}
// This lists all the changes to the fields we are going to make.
- std::vector<TFRewriteData> Changes;
+ std::vector<pkgTagSection::Tag> Changes;
+
+ std::string Size;
+ strprintf(Size, "%llu", (unsigned long long) FileSize);
+ Changes.push_back(pkgTagSection::Tag::Rewrite("Size", Size));
- Changes.push_back(SetTFRewriteData("Size", Size));
for (HashStringList::const_iterator hs = Db.HashesList.begin(); hs != Db.HashesList.end(); ++hs)
{
if (hs->HashType() == "MD5Sum")
- Changes.push_back(SetTFRewriteData("MD5sum", hs->HashValue().c_str()));
+ Changes.push_back(pkgTagSection::Tag::Rewrite("MD5sum", hs->HashValue()));
else if (hs->HashType() == "Checksum-FileSize")
continue;
else
- Changes.push_back(SetTFRewriteData(hs->HashType().c_str(), hs->HashValue().c_str()));
+ Changes.push_back(pkgTagSection::Tag::Rewrite(hs->HashType(), hs->HashValue()));
}
- Changes.push_back(SetTFRewriteData("Filename", NewFileName.c_str()));
- Changes.push_back(SetTFRewriteData("Priority", OverItem->Priority.c_str()));
- Changes.push_back(SetTFRewriteData("Status", 0));
- Changes.push_back(SetTFRewriteData("Optional", 0));
+ Changes.push_back(pkgTagSection::Tag::Rewrite("Filename", NewFileName));
+ Changes.push_back(pkgTagSection::Tag::Rewrite("Priority", OverItem->Priority));
+ Changes.push_back(pkgTagSection::Tag::Remove("Status"));
+ Changes.push_back(pkgTagSection::Tag::Remove("Optional"));
string DescriptionMd5;
if (LongDescription == false) {
MD5Summation descmd5;
descmd5.Add(desc.c_str());
DescriptionMd5 = descmd5.Result().Value();
- Changes.push_back(SetTFRewriteData("Description-md5", DescriptionMd5.c_str()));
+ Changes.push_back(pkgTagSection::Tag::Rewrite("Description-md5", DescriptionMd5));
if (TransWriter != NULL)
TransWriter->DoPackage(Package, desc, DescriptionMd5);
}
@@ -505,7 +497,7 @@ bool PackagesWriter::DoPackage(string FileName)
}
if (NewMaint.empty() == false)
- Changes.push_back(SetTFRewriteData("Maintainer", NewMaint.c_str()));
+ Changes.push_back(pkgTagSection::Tag::Rewrite("Maintainer", NewMaint));
/* Get rid of the Optional tag. This is an ugly, ugly, ugly hack that
dpkg-scanpackages does. Well sort of. dpkg-scanpackages just does renaming
@@ -517,19 +509,17 @@ bool PackagesWriter::DoPackage(string FileName)
{
if (Tags.FindS("Suggests").empty() == false)
OptionalStr = Tags.FindS("Suggests") + ", " + OptionalStr;
- Changes.push_back(SetTFRewriteData("Suggests", OptionalStr.c_str()));
+ Changes.push_back(pkgTagSection::Tag::Rewrite("Suggests", OptionalStr));
}
for (map<string,string>::const_iterator I = OverItem->FieldOverride.begin();
I != OverItem->FieldOverride.end(); ++I)
- Changes.push_back(SetTFRewriteData(I->first.c_str(),I->second.c_str()));
-
- Changes.push_back(SetTFRewriteData( 0, 0));
+ Changes.push_back(pkgTagSection::Tag::Rewrite(I->first, I->second));
// Rewrite and store the fields.
- if (TFRewrite(Output,Tags,TFRewritePackageOrder,Changes.data()) == false)
+ if (Tags.Write(*Output, TFRewritePackageOrder, Changes) == false ||
+ Output->Write("\n", 1) == false)
return false;
- fprintf(Output,"\n");
return Db.Finish();
}
@@ -539,14 +529,13 @@ bool PackagesWriter::DoPackage(string FileName)
// ---------------------------------------------------------------------
/* Create a Translation-Master file for this Packages file */
TranslationWriter::TranslationWriter(string const &File, string const &TransCompress,
- mode_t const &Permissions) : Output(NULL),
- RefCounter(0)
+ mode_t const &Permissions) : RefCounter(0)
{
if (File.empty() == true)
return;
Comp = new MultiCompress(File, TransCompress, Permissions);
- Output = Comp->Input;
+ Output = &Comp->Input;
}
/*}}}*/
// TranslationWriter::DoPackage - Process a single package /*{{{*/
@@ -565,8 +554,10 @@ bool TranslationWriter::DoPackage(string const &Pkg, string const &Desc,
if (Included.find(Record) != Included.end())
return true;
- fprintf(Output, "Package: %s\nDescription-md5: %s\nDescription-en: %s\n",
+ std::string out;
+ strprintf(out, "Package: %s\nDescription-md5: %s\nDescription-en: %s\n",
Pkg.c_str(), MD5.c_str(), Desc.c_str());
+ Output->Write(out.c_str(), out.length());
Included.insert(Record);
return true;
@@ -587,11 +578,10 @@ TranslationWriter::~TranslationWriter()
// SourcesWriter::SourcesWriter - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-SourcesWriter::SourcesWriter(string const &DB, string const &BOverrides,string const &SOverrides,
+SourcesWriter::SourcesWriter(FileFd * const GivenOutput, string const &DB, string const &BOverrides,string const &SOverrides,
string const &ExtOverrides) :
- Db(DB), Stats(Db.Stats)
+ FTWScanner(GivenOutput), Db(DB), Stats(Db.Stats)
{
- Output = stdout;
AddPattern("*.dsc");
DeLinkLimit = 0;
Buffer = 0;
@@ -620,15 +610,16 @@ SourcesWriter::SourcesWriter(string const &DB, string const &BOverrides,string c
}
/*}}}*/
// SourcesWriter::DoPackage - Process a single package /*{{{*/
-static std::ostream& addDscHash(std::ostream &out, unsigned int const DoHashes,
+static std::string getDscHash(unsigned int const DoHashes,
Hashes::SupportedHashes const DoIt, pkgTagSection &Tags, char const * const FieldName,
HashString const * const Hash, unsigned long long Size, std::string FileName)
{
if ((DoHashes & DoIt) != DoIt || Tags.Exists(FieldName) == false || Hash == NULL)
- return out;
+ return "";
+ std::ostringstream out;
out << "\n " << Hash->HashValue() << " " << Size << " " << FileName
<< "\n " << Tags.FindS(FieldName);
- return out;
+ return out.str();
}
bool SourcesWriter::DoPackage(string FileName)
{
@@ -648,18 +639,10 @@ bool SourcesWriter::DoPackage(string FileName)
// the "db cursor"
Db.Finish();
- // read stuff
- char *Start = Db.Dsc.Data;
- char *BlkEnd = Db.Dsc.Data + Db.Dsc.Length;
-
- // Add extra \n to the end, just in case (as in clearsigned they are missing)
- *BlkEnd++ = '\n';
- *BlkEnd++ = '\n';
-
pkgTagSection Tags;
- if (Tags.Scan(Start,BlkEnd - Start) == false)
+ if (Tags.Scan(Db.Dsc.Data.c_str(), Db.Dsc.Data.length()) == false)
return _error->Error("Could not find a record in the DSC '%s'",FileName.c_str());
-
+
if (Tags.Exists("Source") == false)
return _error->Error("Could not find a Source entry in the DSC '%s'",FileName.c_str());
Tags.Trim();
@@ -729,16 +712,10 @@ bool SourcesWriter::DoPackage(string FileName)
// Add the dsc to the files hash list
string const strippedName = flNotDir(FileName);
- std::ostringstream ostreamFiles;
- addDscHash(ostreamFiles, DoHashes, Hashes::MD5SUM, Tags, "Files", Db.HashesList.find("MD5Sum"), St.st_size, strippedName);
- string const Files = ostreamFiles.str();
-
- std::ostringstream ostreamSha1;
- addDscHash(ostreamSha1, DoHashes, Hashes::SHA1SUM, Tags, "Checksums-Sha1", Db.HashesList.find("SHA1"), St.st_size, strippedName);
- std::ostringstream ostreamSha256;
- addDscHash(ostreamSha256, DoHashes, Hashes::SHA256SUM, Tags, "Checksums-Sha256", Db.HashesList.find("SHA256"), St.st_size, strippedName);
- std::ostringstream ostreamSha512;
- addDscHash(ostreamSha512, DoHashes, Hashes::SHA512SUM, Tags, "Checksums-Sha512", Db.HashesList.find("SHA512"), St.st_size, strippedName);
+ std::string const Files = getDscHash(DoHashes, Hashes::MD5SUM, Tags, "Files", Db.HashesList.find("MD5Sum"), St.st_size, strippedName);
+ std::string ChecksumsSha1 = getDscHash(DoHashes, Hashes::SHA1SUM, Tags, "Checksums-Sha1", Db.HashesList.find("SHA1"), St.st_size, strippedName);
+ std::string ChecksumsSha256 = getDscHash(DoHashes, Hashes::SHA256SUM, Tags, "Checksums-Sha256", Db.HashesList.find("SHA256"), St.st_size, strippedName);
+ std::string ChecksumsSha512 = getDscHash(DoHashes, Hashes::SHA512SUM, Tags, "Checksums-Sha512", Db.HashesList.find("SHA512"), St.st_size, strippedName);
// Strip the DirStrip prefix from the FileName and add the PathPrefix
string NewFileName;
@@ -760,7 +737,7 @@ bool SourcesWriter::DoPackage(string FileName)
char *RealPath = NULL;
for (;isspace(*C); C++);
while (*C != 0)
- {
+ {
// Parse each of the elements
if (ParseQuoteWord(C,ParseJnk) == false ||
ParseQuoteWord(C,ParseJnk) == false ||
@@ -790,21 +767,21 @@ bool SourcesWriter::DoPackage(string FileName)
if (hs->HashType() == "MD5Sum" || hs->HashType() == "Checksum-FileSize")
continue;
char const * fieldname;
- std::ostream * out;
+ std::string * out;
if (hs->HashType() == "SHA1")
{
fieldname = "Checksums-Sha1";
- out = &ostreamSha1;
+ out = &ChecksumsSha1;
}
else if (hs->HashType() == "SHA256")
{
fieldname = "Checksums-Sha256";
- out = &ostreamSha256;
+ out = &ChecksumsSha256;
}
else if (hs->HashType() == "SHA512")
{
fieldname = "Checksums-Sha512";
- out = &ostreamSha512;
+ out = &ChecksumsSha512;
}
else
{
@@ -813,10 +790,12 @@ bool SourcesWriter::DoPackage(string FileName)
}
if (Tags.Exists(fieldname) == true)
continue;
- (*out) << "\n " << hs->HashValue() << " " << Db.GetFileSize() << " " << ParseJnk;
+ std::ostringstream streamout;
+ streamout << "\n " << hs->HashValue() << " " << Db.GetFileSize() << " " << ParseJnk;
+ out->append(streamout.str());
}
- // write back the GetFileInfo() stats data
+ // write back the GetFileInfo() stats data
Db.Finish();
}
@@ -837,53 +816,48 @@ bool SourcesWriter::DoPackage(string FileName)
if (Directory.length() > 2)
Directory.erase(Directory.end()-1);
- string const ChecksumsSha1 = ostreamSha1.str();
- string const ChecksumsSha256 = ostreamSha256.str();
- string const ChecksumsSha512 = ostreamSha512.str();
-
// This lists all the changes to the fields we are going to make.
// (5 hardcoded + checksums + maintainer + end marker)
- std::vector<TFRewriteData> Changes;
+ std::vector<pkgTagSection::Tag> Changes;
- Changes.push_back(SetTFRewriteData("Source",Package.c_str(),"Package"));
+ Changes.push_back(pkgTagSection::Tag::Remove("Source"));
+ Changes.push_back(pkgTagSection::Tag::Rewrite("Package", Package));
if (Files.empty() == false)
- Changes.push_back(SetTFRewriteData("Files",Files.c_str()));
+ Changes.push_back(pkgTagSection::Tag::Rewrite("Files", Files));
if (ChecksumsSha1.empty() == false)
- Changes.push_back(SetTFRewriteData("Checksums-Sha1",ChecksumsSha1.c_str()));
+ Changes.push_back(pkgTagSection::Tag::Rewrite("Checksums-Sha1", ChecksumsSha1));
if (ChecksumsSha256.empty() == false)
- Changes.push_back(SetTFRewriteData("Checksums-Sha256",ChecksumsSha256.c_str()));
+ Changes.push_back(pkgTagSection::Tag::Rewrite("Checksums-Sha256", ChecksumsSha256));
if (ChecksumsSha512.empty() == false)
- Changes.push_back(SetTFRewriteData("Checksums-Sha512",ChecksumsSha512.c_str()));
+ Changes.push_back(pkgTagSection::Tag::Rewrite("Checksums-Sha512", ChecksumsSha512));
if (Directory != "./")
- Changes.push_back(SetTFRewriteData("Directory",Directory.c_str()));
- Changes.push_back(SetTFRewriteData("Priority",BestPrio.c_str()));
- Changes.push_back(SetTFRewriteData("Status",0));
+ Changes.push_back(pkgTagSection::Tag::Rewrite("Directory", Directory));
+ Changes.push_back(pkgTagSection::Tag::Rewrite("Priority", BestPrio));
+ Changes.push_back(pkgTagSection::Tag::Remove("Status"));
// Rewrite the maintainer field if necessary
bool MaintFailed;
- string NewMaint = OverItem->SwapMaint(Tags.FindS("Maintainer"),MaintFailed);
+ string NewMaint = OverItem->SwapMaint(Tags.FindS("Maintainer"), MaintFailed);
if (MaintFailed == true)
{
if (NoOverride == false)
{
- NewLine(1);
+ NewLine(1);
ioprintf(c1out, _(" %s maintainer is %s not %s\n"), Package.c_str(),
Tags.FindS("Maintainer").c_str(), OverItem->OldMaint.c_str());
- }
+ }
}
if (NewMaint.empty() == false)
- Changes.push_back(SetTFRewriteData("Maintainer", NewMaint.c_str()));
-
- for (map<string,string>::const_iterator I = SOverItem->FieldOverride.begin();
+ Changes.push_back(pkgTagSection::Tag::Rewrite("Maintainer", NewMaint.c_str()));
+
+ for (map<string,string>::const_iterator I = SOverItem->FieldOverride.begin();
I != SOverItem->FieldOverride.end(); ++I)
- Changes.push_back(SetTFRewriteData(I->first.c_str(),I->second.c_str()));
+ Changes.push_back(pkgTagSection::Tag::Rewrite(I->first, I->second));
- Changes.push_back(SetTFRewriteData(0, 0));
-
// Rewrite and store the fields.
- if (TFRewrite(Output,Tags,TFRewriteSourceOrder,Changes.data()) == false)
+ if (Tags.Write(*Output, TFRewriteSourceOrder, Changes) == false ||
+ Output->Write("\n", 1) == false)
return false;
- fprintf(Output,"\n");
Stats.Packages++;
@@ -894,12 +868,11 @@ bool SourcesWriter::DoPackage(string FileName)
// ContentsWriter::ContentsWriter - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-ContentsWriter::ContentsWriter(string const &DB, string const &Arch) :
- FTWScanner(Arch), Db(DB), Stats(Db.Stats)
+ContentsWriter::ContentsWriter(FileFd * const GivenOutput, string const &DB, string const &Arch) :
+ FTWScanner(GivenOutput, Arch), Db(DB), Stats(Db.Stats)
{
SetExts(".deb");
- Output = stdout;
}
/*}}}*/
// ContentsWriter::DoPackage - Process a single package /*{{{*/
@@ -981,7 +954,7 @@ bool ContentsWriter::ReadFromPkgs(string const &PkgFile,string const &PkgCompres
// ReleaseWriter::ReleaseWriter - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-ReleaseWriter::ReleaseWriter(string const &/*DB*/)
+ReleaseWriter::ReleaseWriter(FileFd * const GivenOutput, string const &/*DB*/) : FTWScanner(GivenOutput)
{
if (_config->FindB("APT::FTPArchive::Release::Default-Patterns", true) == true)
{
@@ -1003,7 +976,6 @@ ReleaseWriter::ReleaseWriter(string const &/*DB*/)
}
AddPatterns(_config->FindVector("APT::FTPArchive::Release::Patterns"));
- Output = stdout;
time_t const now = time(NULL);
setlocale(LC_TIME, "C");
@@ -1047,7 +1019,8 @@ ReleaseWriter::ReleaseWriter(string const &/*DB*/)
if (Value == "")
continue;
- fprintf(Output, "%s: %s\n", (*I).first.c_str(), Value.c_str());
+ std::string const out = I->first + ": " + Value + "\n";
+ Output->Write(out.c_str(), out.length());
}
ConfigToDoHashes(DoHashes, "APT::FTPArchive::Release");
@@ -1083,8 +1056,8 @@ bool ReleaseWriter::DoPackage(string FileName)
CheckSums[NewFileName].size = fd.Size();
- Hashes hs;
- hs.AddFD(fd, 0, DoHashes);
+ Hashes hs(DoHashes);
+ hs.AddFD(fd);
CheckSums[NewFileName].Hashes = hs.GetHashStringList();
fd.Close();
@@ -1094,29 +1067,35 @@ bool ReleaseWriter::DoPackage(string FileName)
/*}}}*/
// ReleaseWriter::Finish - Output the checksums /*{{{*/
// ---------------------------------------------------------------------
-static void printChecksumTypeRecord(FILE * const Output, char const * const Type, map<string, ReleaseWriter::CheckSum> const &CheckSums)
+static void printChecksumTypeRecord(FileFd &Output, char const * const Type, map<string, ReleaseWriter::CheckSum> const &CheckSums)
{
- fprintf(Output, "%s:\n", Type);
- for(map<string,ReleaseWriter::CheckSum>::const_iterator I = CheckSums.begin();
- I != CheckSums.end(); ++I)
- {
- HashString const * const hs = I->second.Hashes.find(Type);
- if (hs == NULL)
- continue;
- fprintf(Output, " %s %16llu %s\n",
- hs->HashValue().c_str(),
- (*I).second.size,
- (*I).first.c_str());
- }
+ {
+ std::string out;
+ strprintf(out, "%s:\n", Type);
+ Output.Write(out.c_str(), out.length());
+ }
+ for(map<string,ReleaseWriter::CheckSum>::const_iterator I = CheckSums.begin();
+ I != CheckSums.end(); ++I)
+ {
+ HashString const * const hs = I->second.Hashes.find(Type);
+ if (hs == NULL)
+ continue;
+ std::string out;
+ strprintf(out, " %s %16llu %s\n",
+ hs->HashValue().c_str(),
+ (*I).second.size,
+ (*I).first.c_str());
+ Output.Write(out.c_str(), out.length());
+ }
}
void ReleaseWriter::Finish()
{
if ((DoHashes & Hashes::MD5SUM) == Hashes::MD5SUM)
- printChecksumTypeRecord(Output, "MD5Sum", CheckSums);
+ printChecksumTypeRecord(*Output, "MD5Sum", CheckSums);
if ((DoHashes & Hashes::SHA1SUM) == Hashes::SHA1SUM)
- printChecksumTypeRecord(Output, "SHA1", CheckSums);
+ printChecksumTypeRecord(*Output, "SHA1", CheckSums);
if ((DoHashes & Hashes::SHA256SUM) == Hashes::SHA256SUM)
- printChecksumTypeRecord(Output, "SHA256", CheckSums);
+ printChecksumTypeRecord(*Output, "SHA256", CheckSums);
if ((DoHashes & Hashes::SHA512SUM) == Hashes::SHA512SUM)
- printChecksumTypeRecord(Output, "SHA512", CheckSums);
+ printChecksumTypeRecord(*Output, "SHA512", CheckSums);
}
diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index 226996475..0ba60db5e 100644
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -42,10 +42,10 @@ class FTWScanner
string Arch;
const char *OriginalPath;
bool ErrorPrinted;
-
+
// Stuff for the delinker
bool NoLinkAct;
-
+
static FTWScanner *Owner;
static int ScannerFTW(const char *File,const struct stat *sb,int Flag);
static int ScannerFile(const char *File, bool const &ReadLink);
@@ -59,10 +59,11 @@ class FTWScanner
{
c1out << endl;
ErrorPrinted = true;
- }
+ }
}
-
+
public:
+ FileFd *Output;
unsigned int DoHashes;
unsigned long DeLinkLimit;
@@ -76,8 +77,8 @@ class FTWScanner
void AddPattern(char const *Pattern) { Patterns.push_back(Pattern); };
void AddPatterns(std::vector<std::string> const &patterns) { Patterns.insert(Patterns.end(), patterns.begin(), patterns.end()); };
bool SetExts(string const &Vals);
-
- FTWScanner(string const &Arch = string());
+
+ FTWScanner(FileFd * const Output, string const &Arch = string());
virtual ~FTWScanner() {};
};
@@ -86,9 +87,9 @@ class MultiCompress;
class TranslationWriter
{
MultiCompress *Comp;
- FILE *Output;
std::set<string> Included;
unsigned short RefCounter;
+ FileFd *Output;
public:
void IncreaseRefCounter() { ++RefCounter; };
@@ -97,7 +98,7 @@ class TranslationWriter
bool DoPackage(string const &Pkg, string const &Desc, string const &MD5);
TranslationWriter(string const &File, string const &TransCompress, mode_t const &Permissions);
- TranslationWriter() : Comp(NULL), Output(NULL), RefCounter(0) {};
+ TranslationWriter() : Comp(NULL), RefCounter(0) {};
~TranslationWriter();
};
@@ -105,7 +106,7 @@ class PackagesWriter : public FTWScanner
{
Override Over;
CacheDB Db;
-
+
public:
// Some flags
@@ -117,7 +118,6 @@ class PackagesWriter : public FTWScanner
// General options
string PathPrefix;
string DirStrip;
- FILE *Output;
struct CacheDB::Stats &Stats;
TranslationWriter *TransWriter;
@@ -126,7 +126,7 @@ class PackagesWriter : public FTWScanner
{return Over.ReadExtraOverride(File);};
virtual bool DoPackage(string FileName);
- PackagesWriter(string const &DB,
+ PackagesWriter(FileFd * const Output, string const &DB,
string const &Overrides,
string const &ExtOverrides = "",
string const &Arch = "");
@@ -136,25 +136,24 @@ class PackagesWriter : public FTWScanner
class ContentsWriter : public FTWScanner
{
CacheDB Db;
-
+
GenContents Gen;
-
+
public:
// General options
- FILE *Output;
struct CacheDB::Stats &Stats;
string Prefix;
-
+
bool DoPackage(string FileName,string Package);
virtual bool DoPackage(string FileName)
{return DoPackage(FileName,string());};
bool ReadFromPkgs(string const &PkgFile,string const &PkgCompress);
- void Finish() {Gen.Print(Output);};
+ void Finish() {Gen.Print(*Output);};
inline bool ReadyDB(string const &DB) {return Db.ReadyDB(DB);};
-
- ContentsWriter(string const &DB, string const &Arch = string());
+
+ ContentsWriter(FileFd * const Output, string const &DB, string const &Arch = string());
virtual ~ContentsWriter() {};
};
@@ -165,21 +164,20 @@ class SourcesWriter : public FTWScanner
Override SOver;
char *Buffer;
unsigned long long BufSize;
-
+
public:
bool NoOverride;
bool DoAlwaysStat;
-
+
// General options
string PathPrefix;
string DirStrip;
- FILE *Output;
struct CacheDB::Stats &Stats;
virtual bool DoPackage(string FileName);
- SourcesWriter(string const &DB,string const &BOverrides,string const &SOverrides,
+ SourcesWriter(FileFd * const Output, string const &DB,string const &BOverrides,string const &SOverrides,
string const &ExtOverrides=string());
virtual ~SourcesWriter() {free(Buffer);};
};
@@ -187,11 +185,10 @@ class SourcesWriter : public FTWScanner
class ReleaseWriter : public FTWScanner
{
public:
- ReleaseWriter(string const &DB);
+ ReleaseWriter(FileFd * const Output, string const &DB);
virtual bool DoPackage(string FileName);
void Finish();
- FILE *Output;
// General options
string PathPrefix;
string DirStrip;
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 74e2ecc6b..67265cfa3 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -260,13 +260,14 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
struct stat Buf;
if (stat(Res.Filename.c_str(),&Buf) != 0)
return _error->Error(_("File not found"));
-
+
+ URIStart(Res);
if (NewID.empty() == false)
CurrentID = NewID;
Res.LastModified = Buf.st_mtime;
Res.Size = Buf.st_size;
- Hashes Hash;
+ Hashes Hash(Itm->ExpectedHashes);
FileFd Fd(Res.Filename, FileFd::ReadOnly);
Hash.AddFD(Fd);
Res.TakeHashes(Hash);
diff --git a/methods/copy.cc b/methods/copy.cc
index a23c0316c..a8e289df5 100644
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -28,16 +28,16 @@
class CopyMethod : public pkgAcqMethod
{
virtual bool Fetch(FetchItem *Itm);
- void CalculateHashes(FetchResult &Res);
+ void CalculateHashes(FetchItem const * const Itm, FetchResult &Res);
public:
CopyMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {};
};
-void CopyMethod::CalculateHashes(FetchResult &Res)
+void CopyMethod::CalculateHashes(FetchItem const * const Itm, FetchResult &Res)
{
- Hashes Hash;
+ Hashes Hash(Itm->ExpectedHashes);
FileFd::CompressMode CompressMode = FileFd::None;
if (_config->FindB("Acquire::GzipIndexes", false) == true)
CompressMode = FileFd::Extension;
@@ -65,21 +65,13 @@ bool CopyMethod::Fetch(FetchItem *Itm)
Res.Size = Buf.st_size;
Res.Filename = Itm->DestFile;
Res.LastModified = Buf.st_mtime;
- Res.IMSHit = false;
+ Res.IMSHit = false;
URIStart(Res);
- // when the files are identical, just compute the hashes
- if(File == Itm->DestFile)
- {
- CalculateHashes(Res);
- URIDone(Res);
- return true;
- }
-
// just calc the hashes if the source and destination are identical
if (File == Itm->DestFile)
{
- CalculateHashes(Res);
+ CalculateHashes(Itm, Res);
URIDone(Res);
return true;
}
@@ -112,7 +104,7 @@ bool CopyMethod::Fetch(FetchItem *Itm)
if (utimes(Res.Filename.c_str(), times) != 0)
return _error->Errno("utimes",_("Failed to set modification time"));
- CalculateHashes(Res);
+ CalculateHashes(Itm, Res);
URIDone(Res);
return true;
diff --git a/methods/file.cc b/methods/file.cc
index 12db62203..5c76ec122 100644
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -16,6 +16,7 @@
#include <config.h>
#include <apt-pkg/acquire-method.h>
+#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/error.h>
#include <apt-pkg/hashes.h>
#include <apt-pkg/fileutl.h>
@@ -33,7 +34,7 @@ class FileMethod : public pkgAcqMethod
public:
- FileMethod() : pkgAcqMethod("1.0",SingleInstance | LocalOnly) {};
+ FileMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig | LocalOnly) {};
};
// FileMethod::Fetch - Fetch a file /*{{{*/
@@ -47,8 +48,27 @@ bool FileMethod::Fetch(FetchItem *Itm)
if (Get.Host.empty() == false)
return _error->Error(_("Invalid URI, local URIS must not start with //"));
- // See if the file exists
struct stat Buf;
+ // deal with destination files which might linger around
+ if (lstat(Itm->DestFile.c_str(), &Buf) == 0)
+ {
+ if ((Buf.st_mode & S_IFREG) != 0)
+ {
+ if (Itm->LastModified == Buf.st_mtime && Itm->LastModified != 0)
+ {
+ HashStringList const hsl = Itm->ExpectedHashes;
+ if (Itm->ExpectedHashes.VerifyFile(File))
+ {
+ Res.Filename = Itm->DestFile;
+ Res.IMSHit = true;
+ }
+ }
+ }
+ }
+ if (Res.IMSHit != true)
+ unlink(Itm->DestFile.c_str());
+
+ // See if the file exists
if (stat(File.c_str(),&Buf) == 0)
{
Res.Size = Buf.st_size;
@@ -56,37 +76,50 @@ bool FileMethod::Fetch(FetchItem *Itm)
Res.LastModified = Buf.st_mtime;
Res.IMSHit = false;
if (Itm->LastModified == Buf.st_mtime && Itm->LastModified != 0)
- Res.IMSHit = true;
+ {
+ unsigned long long const filesize = Itm->ExpectedHashes.FileSize();
+ if (filesize != 0 && filesize == Res.Size)
+ Res.IMSHit = true;
+ }
+
+ Hashes Hash(Itm->ExpectedHashes);
+ FileFd Fd(File, FileFd::ReadOnly);
+ Hash.AddFD(Fd);
+ Res.TakeHashes(Hash);
}
-
- // See if we can compute a file without a .gz exentsion
- std::string::size_type Pos = File.rfind(".gz");
- if (Pos + 3 == File.length())
+ if (Res.IMSHit == false)
+ URIStart(Res);
+
+ // See if the uncompressed file exists and reuse it
+ FetchResult AltRes;
+ AltRes.Filename.clear();
+ std::vector<std::string> extensions = APT::Configuration::getCompressorExtensions();
+ for (std::vector<std::string>::const_iterator ext = extensions.begin(); ext != extensions.end(); ++ext)
{
- File = std::string(File,0,Pos);
- if (stat(File.c_str(),&Buf) == 0)
+ if (APT::String::Endswith(File, *ext) == true)
{
- FetchResult AltRes;
- AltRes.Size = Buf.st_size;
- AltRes.Filename = File;
- AltRes.LastModified = Buf.st_mtime;
- AltRes.IMSHit = false;
- if (Itm->LastModified == Buf.st_mtime && Itm->LastModified != 0)
- AltRes.IMSHit = true;
-
- URIDone(Res,&AltRes);
- return true;
- }
+ std::string const unfile = File.substr(0, File.length() - ext->length() - 1);
+ if (stat(unfile.c_str(),&Buf) == 0)
+ {
+ AltRes.Size = Buf.st_size;
+ AltRes.Filename = unfile;
+ AltRes.LastModified = Buf.st_mtime;
+ AltRes.IMSHit = false;
+ if (Itm->LastModified == Buf.st_mtime && Itm->LastModified != 0)
+ AltRes.IMSHit = true;
+ break;
+ }
+ // no break here as we could have situations similar to '.gz' vs '.tar.gz' here
+ }
}
-
- if (Res.Filename.empty() == true)
+
+ if (AltRes.Filename.empty() == false)
+ URIDone(Res,&AltRes);
+ else if (Res.Filename.empty() == false)
+ URIDone(Res);
+ else
return _error->Error(_("File not found"));
- Hashes Hash;
- FileFd Fd(Res.Filename, FileFd::ReadOnly);
- Hash.AddFD(Fd);
- Res.TakeHashes(Hash);
- URIDone(Res);
return true;
}
/*}}}*/
diff --git a/methods/ftp.cc b/methods/ftp.cc
index 0504e5872..92d8573f1 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -259,19 +259,21 @@ bool FTPConn::Login()
{
if (Opts->Value.empty() == true)
continue;
-
+
// Substitute the variables into the command
- char SitePort[20];
- if (ServerName.Port != 0)
- sprintf(SitePort,"%u",ServerName.Port);
- else
- strcpy(SitePort,"21");
string Tmp = Opts->Value;
Tmp = SubstVar(Tmp,"$(PROXY_USER)",Proxy.User);
Tmp = SubstVar(Tmp,"$(PROXY_PASS)",Proxy.Password);
Tmp = SubstVar(Tmp,"$(SITE_USER)",User);
Tmp = SubstVar(Tmp,"$(SITE_PASS)",Pass);
- Tmp = SubstVar(Tmp,"$(SITE_PORT)",SitePort);
+ if (ServerName.Port != 0)
+ {
+ std::string SitePort;
+ strprintf(SitePort, "%u", ServerName.Port);
+ Tmp = SubstVar(Tmp,"$(SITE_PORT)", SitePort);
+ }
+ else
+ Tmp = SubstVar(Tmp,"$(SITE_PORT)", "21");
Tmp = SubstVar(Tmp,"$(SITE)",ServerName.Host);
// Send the command
@@ -1062,7 +1064,7 @@ bool FtpMethod::Fetch(FetchItem *Itm)
}
// Open the file
- Hashes Hash;
+ Hashes Hash(Itm->ExpectedHashes);
{
FileFd Fd(Itm->DestFile,FileFd::WriteAny);
if (_error->PendingError() == true)
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 488c16826..41f138be6 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -86,33 +86,12 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
FILE *pipein = fdopen(fd[0], "r");
// Loop over the output of apt-key (which really is gnupg), and check the signatures.
- size_t buffersize = 64;
- char *buffer = (char *) malloc(buffersize);
- size_t bufferoff = 0;
+ size_t buffersize = 0;
+ char *buffer = NULL;
while (1)
{
- int c;
-
- // Read a line. Sigh.
- while ((c = getc(pipein)) != EOF && c != '\n')
- {
- if (bufferoff == buffersize)
- {
- char* newBuffer = (char *) realloc(buffer, buffersize *= 2);
- if (newBuffer == NULL)
- {
- free(buffer);
- return "Couldn't allocate a buffer big enough for reading";
- }
- buffer = newBuffer;
- }
- *(buffer+bufferoff) = c;
- bufferoff++;
- }
- if (bufferoff == 0 && c == EOF)
- break;
- *(buffer+bufferoff) = '\0';
- bufferoff = 0;
+ if (getline(&buffer, &buffersize, pipein) == -1)
+ break;
if (Debug == true)
std::clog << "Read: " << buffer << std::endl;
@@ -126,7 +105,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
std::clog << "Got BADSIG! " << std::endl;
BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX)));
}
-
+
if (strncmp(buffer, GNUPGNOPUBKEY, sizeof(GNUPGNOPUBKEY)-1) == 0)
{
if (Debug == true)
diff --git a/methods/gzip.cc b/methods/gzip.cc
index 387c05f2e..65519633c 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -91,7 +91,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
return false;
// Read data from source, generate checksums and write
- Hashes Hash;
+ Hashes Hash(Itm->ExpectedHashes);
bool Failed = false;
while (1)
{
diff --git a/methods/http.cc b/methods/http.cc
index a5de13511..ce697a338 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -64,8 +64,8 @@ const unsigned int CircleBuf::BW_HZ=10;
// CircleBuf::CircleBuf - Circular input buffer /*{{{*/
// ---------------------------------------------------------------------
/* */
-CircleBuf::CircleBuf(unsigned long long Size)
- : Size(Size), Hash(0), TotalWriten(0)
+CircleBuf::CircleBuf(unsigned long long Size)
+ : Size(Size), Hash(NULL), TotalWriten(0)
{
Buf = new unsigned char[Size];
Reset();
@@ -84,10 +84,10 @@ void CircleBuf::Reset()
TotalWriten = 0;
MaxGet = (unsigned long long)-1;
OutQueue = string();
- if (Hash != 0)
+ if (Hash != NULL)
{
delete Hash;
- Hash = new Hashes;
+ Hash = NULL;
}
}
/*}}}*/
@@ -222,7 +222,7 @@ bool CircleBuf::Write(int Fd)
TotalWriten += Res;
- if (Hash != 0)
+ if (Hash != NULL)
Hash->Add(Buf + (OutP%Size),Res);
OutP += Res;
@@ -442,10 +442,12 @@ bool HttpServerState::RunData(FileFd * const File)
{
/* Closes encoding is used when the server did not specify a size, the
loss of the connection means we are done */
- if (Encoding == Closes)
+ if (Persistent == false)
In.Limit(-1);
+ else if (JunkSize != 0)
+ In.Limit(JunkSize);
else
- In.Limit(Size - StartPos);
+ In.Limit(DownloadSize);
// Just transfer the whole block.
do
@@ -482,16 +484,14 @@ APT_PURE bool HttpServerState::IsOpen() /*{{{*/
return (ServerFd != -1);
}
/*}}}*/
-bool HttpServerState::InitHashes(FileFd &File) /*{{{*/
+bool HttpServerState::InitHashes(HashStringList const &ExpectedHashes) /*{{{*/
{
delete In.Hash;
- In.Hash = new Hashes;
-
- // Set the expected size and read file for the hashes
- File.Truncate(StartPos);
- return In.Hash->AddFD(File, StartPos);
+ In.Hash = new Hashes(ExpectedHashes);
+ return true;
}
/*}}}*/
+
APT_PURE Hashes * HttpServerState::GetHashes() /*{{{*/
{
return In.Hash;
@@ -522,7 +522,7 @@ bool HttpServerState::Die(FileFd &File)
// See if this is because the server finished the data stream
if (In.IsLimit() == false && State != HttpServerState::Header &&
- Encoding != HttpServerState::Closes)
+ Persistent == true)
{
Close();
if (LErrno == 0)
@@ -569,7 +569,7 @@ bool HttpServerState::Flush(FileFd * const File)
return true;
}
- if (In.IsLimit() == true || Encoding == ServerState::Closes)
+ if (In.IsLimit() == true || Persistent == false)
return true;
}
return false;
@@ -770,8 +770,6 @@ bool HttpMethod::Configuration(string Message)
if (ServerMethod::Configuration(Message) == false)
return false;
- DropPrivsOrDie();
-
AllowRedirect = _config->FindB("Acquire::http::AllowRedirect",true);
PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth",
PipelineDepth);
diff --git a/methods/http.h b/methods/http.h
index 40a88a7be..e73871931 100644
--- a/methods/http.h
+++ b/methods/http.h
@@ -111,7 +111,7 @@ struct HttpServerState: public ServerState
virtual bool Open();
virtual bool IsOpen();
virtual bool Close();
- virtual bool InitHashes(FileFd &File);
+ virtual bool InitHashes(HashStringList const &ExpectedHashes);
virtual Hashes * GetHashes();
virtual bool Die(FileFd &File);
virtual bool Flush(FileFd * const File);
diff --git a/methods/https.cc b/methods/https.cc
index 366148e19..d2ddf6fcf 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -37,21 +37,19 @@
/*}}}*/
using namespace std;
-bool HttpsMethod::Configuration(std::string Message)
-{
- if (pkgAcqMethod::Configuration(Message) == false)
- return false;
-
- DropPrivsOrDie();
-
- return true;
-}
+struct APT_HIDDEN CURLUserPointer {
+ HttpsMethod * const https;
+ HttpsMethod::FetchResult * const Res;
+ HttpsMethod::FetchItem const * const Itm;
+ CURLUserPointer(HttpsMethod * const https, HttpsMethod::FetchResult * const Res,
+ HttpsMethod::FetchItem const * const Itm) : https(https), Res(Res), Itm(Itm) {}
+};
size_t
HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp)
{
size_t len = size * nmemb;
- HttpsMethod *me = (HttpsMethod *)userp;
+ CURLUserPointer *me = (CURLUserPointer *)userp;
std::string line((char*) buffer, len);
for (--len; len > 0; --len)
if (isspace(line[len]) == 0)
@@ -63,20 +61,52 @@ HttpsMethod::parse_header(void *buffer, size_t size, size_t nmemb, void *userp)
if (line.empty() == true)
{
- if (me->Server->Result != 416 && me->Server->StartPos != 0)
+ if (me->https->Server->Result != 416 && me->https->Server->StartPos != 0)
;
- else if (me->Server->Result == 416 && me->Server->Size == me->File->FileSize())
+ else if (me->https->Server->Result == 416)
{
- me->Server->Result = 200;
- me->Server->StartPos = me->Server->Size;
+ bool partialHit = false;
+ if (me->Itm->ExpectedHashes.usable() == true)
+ {
+ Hashes resultHashes(me->Itm->ExpectedHashes);
+ FileFd file(me->Itm->DestFile, FileFd::ReadOnly);
+ me->https->Server->TotalFileSize = file.FileSize();
+ me->https->Server->Date = file.ModificationTime();
+ resultHashes.AddFD(file);
+ HashStringList const hashList = resultHashes.GetHashStringList();
+ partialHit = (me->Itm->ExpectedHashes == hashList);
+ }
+ else if (me->https->Server->Result == 416 && me->https->Server->TotalFileSize == me->https->File->FileSize())
+ partialHit = true;
+
+ if (partialHit == true)
+ {
+ me->https->Server->Result = 200;
+ me->https->Server->StartPos = me->https->Server->TotalFileSize;
+ // the actual size is not important for https as curl will deal with it
+ // by itself and e.g. doesn't bother us with transport-encoding…
+ me->https->Server->JunkSize = std::numeric_limits<unsigned long long>::max();
+ }
+ else
+ me->https->Server->StartPos = 0;
}
else
- me->Server->StartPos = 0;
+ me->https->Server->StartPos = 0;
+
+ me->Res->LastModified = me->https->Server->Date;
+ me->Res->Size = me->https->Server->TotalFileSize;
+ me->Res->ResumePoint = me->https->Server->StartPos;
- me->File->Truncate(me->Server->StartPos);
- me->File->Seek(me->Server->StartPos);
+ // we expect valid data, so tell our caller we get the file now
+ if (me->https->Server->Result >= 200 && me->https->Server->Result < 300)
+ {
+ if (me->https->Server->JunkSize == 0 && me->Res->Size != 0 && me->Res->Size > me->Res->ResumePoint)
+ me->https->URIStart(*me->Res);
+ if (me->https->Server->AddPartialFileToHashes(*(me->https->File)) == false)
+ return 0;
+ }
}
- else if (me->Server->HeaderLine(line) == false)
+ else if (me->https->Server->HeaderLine(line) == false)
return 0;
return size*nmemb;
@@ -86,41 +116,54 @@ size_t
HttpsMethod::write_data(void *buffer, size_t size, size_t nmemb, void *userp)
{
HttpsMethod *me = (HttpsMethod *)userp;
+ size_t buffer_size = size * nmemb;
+ // we don't need to count the junk here, just drop anything we get as
+ // we don't always know how long it would be, e.g. in chunked encoding.
+ if (me->Server->JunkSize != 0)
+ return buffer_size;
- if (me->Res.Size == 0)
- me->URIStart(me->Res);
- if(me->File->Write(buffer, size*nmemb) != true)
- return false;
+ if(me->File->Write(buffer, buffer_size) != true)
+ return 0;
- if(me->Queue->MaximumSize > 0 && me->File->Tell() > me->Queue->MaximumSize)
+ if(me->Queue->MaximumSize > 0)
{
- me->SetFailReason("MaximumSizeExceeded");
- return _error->Error("Writing more data than expected (%llu > %llu)",
- me->TotalWritten, me->Queue->MaximumSize);
+ unsigned long long const TotalWritten = me->File->Tell();
+ if (TotalWritten > me->Queue->MaximumSize)
+ {
+ me->SetFailReason("MaximumSizeExceeded");
+ _error->Error("Writing more data than expected (%llu > %llu)",
+ TotalWritten, me->Queue->MaximumSize);
+ return 0;
+ }
}
- 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 long)dltotal;
- }
- return 0;
+ if (me->Server->GetHashes()->Add((unsigned char const * const)buffer, buffer_size) == false)
+ return 0;
+
+ return buffer_size;
}
// HttpsServerState::HttpsServerState - Constructor /*{{{*/
-HttpsServerState::HttpsServerState(URI Srv,HttpsMethod * /*Owner*/) : ServerState(Srv, NULL)
+HttpsServerState::HttpsServerState(URI Srv,HttpsMethod * Owner) : ServerState(Srv, Owner), Hash(NULL)
{
TimeOut = _config->FindI("Acquire::https::Timeout",TimeOut);
Reset();
}
/*}}}*/
+bool HttpsServerState::InitHashes(HashStringList const &ExpectedHashes) /*{{{*/
+{
+ delete Hash;
+ Hash = new Hashes(ExpectedHashes);
+ return true;
+}
+ /*}}}*/
+APT_PURE Hashes * HttpsServerState::GetHashes() /*{{{*/
+{
+ return Hash;
+}
+ /*}}}*/
-void HttpsMethod::SetupProxy() /*{{{*/
+void HttpsMethod::SetupProxy() /*{{{*/
{
URI ServerName = Queue->Uri;
@@ -183,7 +226,7 @@ void HttpsMethod::SetupProxy() /*{{{*/
bool HttpsMethod::Fetch(FetchItem *Itm)
{
struct stat SBuf;
- struct curl_slist *headers=NULL;
+ struct curl_slist *headers=NULL;
char curl_errorstr[CURL_ERROR_SIZE];
URI Uri = Itm->Uri;
string remotehost = Uri.Host;
@@ -198,16 +241,16 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc"));
+ FetchResult Res;
+ CURLUserPointer userp(this, &Res, Itm);
// callbacks
curl_easy_setopt(curl, CURLOPT_URL, static_cast<string>(Uri).c_str());
curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, parse_header);
- curl_easy_setopt(curl, CURLOPT_WRITEHEADER, this);
+ curl_easy_setopt(curl, CURLOPT_WRITEHEADER, &userp);
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);
// options
- curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false);
+ curl_easy_setopt(curl, CURLOPT_NOPROGRESS, true);
curl_easy_setopt(curl, CURLOPT_FILETIME, true);
// only allow curl to handle https, not the other stuff it supports
curl_easy_setopt(curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS);
@@ -316,13 +359,11 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, timeout);
// set redirect options and default to 10 redirects
- bool const AllowRedirect = _config->FindB("Acquire::https::AllowRedirect",
- _config->FindB("Acquire::http::AllowRedirect",true));
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, AllowRedirect);
curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 10);
// debug
- if(_config->FindB("Debug::Acquire::https", false))
+ if (Debug == true)
curl_easy_setopt(curl, CURLOPT_VERBOSE, true);
// error handling
@@ -359,7 +400,9 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
// go for it - if the file exists, append on it
File = new FileFd(Itm->DestFile, FileFd::WriteAny);
- Server = new HttpsServerState(Itm->Uri, this);
+ Server = CreateServerState(Itm->Uri);
+ if (Server->InitHashes(Itm->ExpectedHashes) == false)
+ return false;
// keep apt updated
Res.Filename = Itm->DestFile;
@@ -379,7 +422,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
if (success != 0)
{
_error->Error("%s", curl_errorstr);
- unlink(File->Name().c_str());
return false;
}
@@ -402,30 +444,29 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
char err[255];
snprintf(err, sizeof(err) - 1, "HttpError%i", Server->Result);
SetFailReason(err);
- _error->Error("%s", err);
+ _error->Error("%i %s", Server->Result, Server->Code);
// unlink, no need keep 401/404 page content in partial/
unlink(File->Name().c_str());
return false;
}
- struct stat resultStat;
- if (unlikely(stat(File->Name().c_str(), &resultStat) != 0))
- {
- _error->Errno("stat", "Unable to access file %s", File->Name().c_str());
- return false;
- }
- Res.Size = resultStat.st_size;
-
// invalid range-request
if (Server->Result == 416)
{
unlink(File->Name().c_str());
- Res.Size = 0;
delete File;
Redirect(Itm->Uri);
return true;
}
+ struct stat resultStat;
+ if (unlikely(stat(File->Name().c_str(), &resultStat) != 0))
+ {
+ _error->Errno("stat", "Unable to access file %s", File->Name().c_str());
+ return false;
+ }
+ Res.Size = resultStat.st_size;
+
// Timestamp
curl_easy_getinfo(curl, CURLINFO_FILETIME, &Res.LastModified);
if (Res.LastModified != -1)
@@ -440,20 +481,35 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
Res.LastModified = resultStat.st_mtime;
// take hashes
- Hashes Hash;
- FileFd Fd(Res.Filename, FileFd::ReadOnly);
- Hash.AddFD(Fd);
- Res.TakeHashes(Hash);
+ Res.TakeHashes(*(Server->GetHashes()));
// keep apt updated
URIDone(Res);
// cleanup
- Res.Size = 0;
delete File;
return true;
}
+ /*}}}*/
+// HttpsMethod::Configuration - Handle a configuration message /*{{{*/
+bool HttpsMethod::Configuration(string Message)
+{
+ if (ServerMethod::Configuration(Message) == false)
+ return false;
+
+ AllowRedirect = _config->FindB("Acquire::https::AllowRedirect",
+ _config->FindB("Acquire::http::AllowRedirect", true));
+ Debug = _config->FindB("Debug::Acquire::https",false);
+
+ return true;
+}
+ /*}}}*/
+ServerState * HttpsMethod::CreateServerState(URI uri) /*{{{*/
+{
+ return new HttpsServerState(uri, this);
+}
+ /*}}}*/
int main()
{
diff --git a/methods/https.h b/methods/https.h
index 9df18e83a..57fc292ee 100644
--- a/methods/https.h
+++ b/methods/https.h
@@ -29,6 +29,8 @@ class FileFd;
class HttpsServerState : public ServerState
{
+ Hashes * Hash;
+
protected:
virtual bool ReadHeaderLines(std::string &/*Data*/) { return false; }
virtual bool LoadNextResponse(bool const /*ToFile*/, FileFd * const /*File*/) { return false; }
@@ -42,8 +44,8 @@ class HttpsServerState : public ServerState
virtual bool Open() { return false; }
virtual bool IsOpen() { return false; }
virtual bool Close() { return false; }
- virtual bool InitHashes(FileFd &/*File*/) { return false; }
- virtual Hashes * GetHashes() { return NULL; }
+ virtual bool InitHashes(HashStringList const &ExpectedHashes);
+ virtual Hashes * GetHashes();
virtual bool Die(FileFd &/*File*/) { return false; }
virtual bool Flush(FileFd * const /*File*/) { return false; }
virtual bool Go(bool /*ToFile*/, FileFd * const /*File*/) { return false; }
@@ -52,28 +54,34 @@ class HttpsServerState : public ServerState
virtual ~HttpsServerState() {Close();};
};
-class HttpsMethod : public pkgAcqMethod
+class HttpsMethod : public ServerMethod
{
// minimum speed in bytes/se that triggers download timeout handling
static const int DL_MIN_SPEED = 10;
virtual bool Fetch(FetchItem *);
- virtual bool Configuration(std::string Message);
static size_t parse_header(void *buffer, size_t size, size_t nmemb, void *userp);
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);
+ static int progress_callback(void *clientp, double dltotal, double dlnow,
+ double ultotal, double ulnow);
void SetupProxy();
CURL *curl;
- FetchResult Res;
- HttpsServerState *Server;
- unsigned long long TotalWritten;
+ ServerState *Server;
+
+ // Used by ServerMethods unused by https
+ virtual void SendReq(FetchItem *) { exit(42); }
+ virtual void RotateDNS() { exit(42); }
public:
FileFd *File;
-
- HttpsMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig), Server(NULL), TotalWritten(0), File(NULL)
+
+ virtual bool Configuration(std::string Message);
+ virtual ServerState * CreateServerState(URI uri);
+ using pkgAcqMethod::FetchResult;
+ using pkgAcqMethod::FetchItem;
+
+ HttpsMethod() : ServerMethod("1.2",Pipeline | SendConfig), File(NULL)
{
curl = curl_easy_init();
};
diff --git a/methods/rred.cc b/methods/rred.cc
index cabb3c456..54123ab9c 100644
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -21,6 +21,7 @@
#include <vector>
#include <assert.h>
+#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -35,7 +36,7 @@ class MemBlock {
char *start;
size_t size;
char *free;
- struct MemBlock *next;
+ MemBlock *next;
MemBlock(size_t size) : size(size), next(NULL)
{
@@ -116,7 +117,7 @@ struct Change {
size_t add_len; /* bytes */
char *add;
- Change(int off)
+ Change(size_t off)
{
offset = off;
del_cnt = add_cnt = add_len = 0;
@@ -150,11 +151,11 @@ class FileChanges {
std::list<struct Change>::iterator where;
size_t pos; // line number is as far left of iterator as possible
- bool pos_is_okay(void)
+ bool pos_is_okay(void) const
{
#ifdef POSDEBUG
size_t cpos = 0;
- std::list<struct Change>::iterator x;
+ std::list<struct Change>::const_iterator x;
for (x = changes.begin(); x != where; ++x) {
assert(x != changes.end());
cpos += x->offset + x->add_cnt;
@@ -388,28 +389,37 @@ class Patch {
public:
- void read_diff(FileFd &f)
+ bool read_diff(FileFd &f, Hashes * const h)
{
char buffer[BLOCK_SIZE];
bool cmdwanted = true;
- Change ch(0);
- while(f.ReadLine(buffer, sizeof(buffer)))
- {
+ Change ch(std::numeric_limits<size_t>::max());
+ if (f.ReadLine(buffer, sizeof(buffer)) == NULL)
+ return _error->Error("Reading first line of patchfile %s failed", f.Name().c_str());
+ do {
+ if (h != NULL)
+ h->Add(buffer);
if (cmdwanted) {
char *m, *c;
size_t s, e;
- s = strtol(buffer, &m, 10);
- if (m == buffer) {
- s = e = ch.offset + ch.add_cnt;
- c = buffer;
- } else if (*m == ',') {
- m++;
+ errno = 0;
+ s = strtoul(buffer, &m, 10);
+ if (unlikely(m == buffer || s == std::numeric_limits<unsigned long>::max() || errno != 0))
+ return _error->Error("Parsing patchfile %s failed: Expected an effected line start", f.Name().c_str());
+ else if (*m == ',') {
+ ++m;
e = strtol(m, &c, 10);
+ if (unlikely(m == c || e == std::numeric_limits<unsigned long>::max() || errno != 0))
+ return _error->Error("Parsing patchfile %s failed: Expected an effected line end", f.Name().c_str());
+ if (unlikely(e < s))
+ return _error->Error("Parsing patchfile %s failed: Effected lines end %lu is before start %lu", f.Name().c_str(), e, s);
} else {
e = s;
c = m;
}
+ if (s > ch.offset)
+ return _error->Error("Parsing patchfile %s failed: Effected line is after previous effected line", f.Name().c_str());
switch(*c) {
case 'a':
cmdwanted = false;
@@ -420,6 +430,8 @@ class Patch {
ch.del_cnt = 0;
break;
case 'c':
+ if (unlikely(s == 0))
+ return _error->Error("Parsing patchfile %s failed: Change command can't effect line zero", f.Name().c_str());
cmdwanted = false;
ch.add = NULL;
ch.add_cnt = 0;
@@ -428,6 +440,8 @@ class Patch {
ch.del_cnt = e - s + 1;
break;
case 'd':
+ if (unlikely(s == 0))
+ return _error->Error("Parsing patchfile %s failed: Delete command can't effect line zero", f.Name().c_str());
ch.offset = s - 1;
ch.del_cnt = e - s + 1;
ch.add = NULL;
@@ -435,9 +449,11 @@ class Patch {
ch.add_len = 0;
filechanges.add_change(ch);
break;
+ default:
+ return _error->Error("Parsing patchfile %s failed: Unknown command", f.Name().c_str());
}
} else { /* !cmdwanted */
- if (buffer[0] == '.' && buffer[1] == '\n') {
+ if (strcmp(buffer, ".\n") == 0) {
cmdwanted = true;
filechanges.add_change(ch);
} else {
@@ -463,7 +479,8 @@ class Patch {
}
}
}
- }
+ } while(f.ReadLine(buffer, sizeof(buffer)));
+ return true;
}
void write_diff(FILE *f)
@@ -519,8 +536,29 @@ class RredMethod : public pkgAcqMethod {
private:
bool Debug;
+ struct PDiffFile {
+ std::string FileName;
+ HashStringList ExpectedHashes;
+ PDiffFile(std::string const &FileName, HashStringList const &ExpectedHashes) :
+ FileName(FileName), ExpectedHashes(ExpectedHashes) {}
+ };
+
+ HashStringList ReadExpectedHashesForPatch(unsigned int const patch, std::string const &Message)
+ {
+ HashStringList ExpectedHashes;
+ for (char const * const * type = HashString::SupportedHashes(); *type != NULL; ++type)
+ {
+ std::string tagname;
+ strprintf(tagname, "Patch-%d-%s-Hash", patch, *type);
+ std::string const hashsum = LookupTag(Message, tagname.c_str());
+ if (hashsum.empty() == false)
+ ExpectedHashes.push_back(HashString(*type, hashsum));
+ }
+ return ExpectedHashes;
+ }
+
protected:
- virtual bool Fetch(FetchItem *Itm) {
+ virtual bool URIAcquire(std::string const &Message, FetchItem *Itm) {
Debug = _config->FindB("Debug::pkgAcquire::RRed", false);
URI Get = Itm->Uri;
std::string Path = Get.Host + Get.Path; // rred:/path - no host
@@ -534,11 +572,17 @@ class RredMethod : public pkgAcqMethod {
} else
URIStart(Res);
- std::vector<std::string> patchpaths;
+ std::vector<PDiffFile> patchfiles;
Patch patch;
if (FileExists(Path + ".ed") == true)
- patchpaths.push_back(Path + ".ed");
+ {
+ HashStringList const ExpectedHashes = ReadExpectedHashesForPatch(0, Message);
+ std::string const FileName = Path + ".ed";
+ if (ExpectedHashes.usable() == false)
+ return _error->Error("No hashes found for uncompressed patch: %s", FileName.c_str());
+ patchfiles.push_back(PDiffFile(FileName, ExpectedHashes));
+ }
else
{
_error->PushToStack();
@@ -546,31 +590,44 @@ class RredMethod : public pkgAcqMethod {
_error->RevertToStack();
std::string const baseName = Path + ".ed.";
+ unsigned int seen_patches = 0;
for (std::vector<std::string>::const_iterator p = patches.begin();
p != patches.end(); ++p)
+ {
if (p->compare(0, baseName.length(), baseName) == 0)
- patchpaths.push_back(*p);
+ {
+ HashStringList const ExpectedHashes = ReadExpectedHashesForPatch(seen_patches, Message);
+ if (ExpectedHashes.usable() == false)
+ return _error->Error("No hashes found for uncompressed patch %d: %s", seen_patches, p->c_str());
+ patchfiles.push_back(PDiffFile(*p, ExpectedHashes));
+ ++seen_patches;
+ }
+ }
}
std::string patch_name;
- for (std::vector<std::string>::iterator I = patchpaths.begin();
- I != patchpaths.end();
+ for (std::vector<PDiffFile>::iterator I = patchfiles.begin();
+ I != patchfiles.end();
++I)
{
- patch_name = *I;
+ patch_name = I->FileName;
if (Debug == true)
std::clog << "Patching " << Path << " with " << patch_name
<< std::endl;
FileFd p;
+ Hashes patch_hash(I->ExpectedHashes);
// all patches are compressed, even if the name doesn't reflect it
- if (p.Open(patch_name, FileFd::ReadOnly, FileFd::Gzip) == false) {
- std::cerr << "Could not open patch file " << patch_name << std::endl;
+ if (p.Open(patch_name, FileFd::ReadOnly, FileFd::Gzip) == false ||
+ patch.read_diff(p, &patch_hash) == false)
+ {
_error->DumpErrors(std::cerr);
- abort();
+ return false;
}
- patch.read_diff(p);
p.Close();
+ HashStringList const hsl = patch_hash.GetHashStringList();
+ if (hsl != I->ExpectedHashes)
+ return _error->Error("Hash Sum mismatch for uncompressed patch %s", patch_name.c_str());
}
if (Debug == true)
@@ -581,8 +638,7 @@ class RredMethod : public pkgAcqMethod {
FILE *inp = fopen(Path.c_str(), "r");
FILE *out = fopen(Itm->DestFile.c_str(), "w");
- Hashes hash;
-
+ Hashes hash(Itm->ExpectedHashes);
patch.apply_against_file(out, inp, &hash);
fclose(out);
@@ -615,6 +671,16 @@ class RredMethod : public pkgAcqMethod {
return true;
}
+ bool Configuration(std::string Message)
+ {
+ if (pkgAcqMethod::Configuration(Message) == false)
+ return false;
+
+ DropPrivsOrDie();
+
+ return true;
+ }
+
public:
RredMethod() : pkgAcqMethod("2.0",SingleInstance | SendConfig), Debug(false) {}
};
@@ -643,7 +709,11 @@ int main(int argc, char **argv)
_error->DumpErrors(std::cerr);
exit(1);
}
- patch.read_diff(p);
+ if (patch.read_diff(p, NULL) == false)
+ {
+ _error->DumpErrors(std::cerr);
+ exit(2);
+ }
}
if (just_diff) {
diff --git a/methods/rsh.cc b/methods/rsh.cc
index 0e949160b..52349c61c 100644
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -477,7 +477,7 @@ bool RSHMethod::Fetch(FetchItem *Itm)
}
// Open the file
- Hashes Hash;
+ Hashes Hash(Itm->ExpectedHashes);
{
FileFd Fd(Itm->DestFile,FileFd::WriteAny);
if (_error->PendingError() == true)
diff --git a/methods/server.cc b/methods/server.cc
index c4689ff12..f61a6fedb 100644
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -54,7 +54,8 @@ ServerState::RunHeadersResult ServerState::RunHeaders(FileFd * const File,
Major = 0;
Minor = 0;
Result = 0;
- Size = 0;
+ TotalFileSize = 0;
+ JunkSize = 0;
StartPos = 0;
Encoding = Closes;
HaveContent = false;
@@ -128,7 +129,7 @@ bool ServerState::HeaderLine(string Line)
if (elements == 3)
{
Code[0] = '\0';
- if (Owner->Debug == true)
+ if (Owner != NULL && Owner->Debug == true)
clog << "HTTP server doesn't give Reason-Phrase for " << Result << std::endl;
}
else if (elements != 4)
@@ -163,15 +164,22 @@ bool ServerState::HeaderLine(string Line)
Encoding = Stream;
HaveContent = true;
- // The length is already set from the Content-Range header
- if (StartPos != 0)
- return true;
+ unsigned long long * DownloadSizePtr = &DownloadSize;
+ if (Result == 416)
+ DownloadSizePtr = &JunkSize;
- Size = strtoull(Val.c_str(), NULL, 10);
- if (Size >= std::numeric_limits<unsigned long long>::max())
+ *DownloadSizePtr = strtoull(Val.c_str(), NULL, 10);
+ if (*DownloadSizePtr >= std::numeric_limits<unsigned long long>::max())
return _error->Errno("HeaderLine", _("The HTTP server sent an invalid Content-Length header"));
- else if (Size == 0)
+ else if (*DownloadSizePtr == 0)
HaveContent = false;
+
+ // On partial content (206) the Content-Length less than the real
+ // size, so do not set it here but leave that to the Content-Range
+ // header instead
+ if(Result != 206 && TotalFileSize == 0)
+ TotalFileSize = DownloadSize;
+
return true;
}
@@ -186,15 +194,15 @@ bool ServerState::HeaderLine(string Line)
HaveContent = true;
// §14.16 says 'byte-range-resp-spec' should be a '*' in case of 416
- if (Result == 416 && sscanf(Val.c_str(), "bytes */%llu",&Size) == 1)
- {
- StartPos = 1; // ignore Content-Length, it would override Size
- HaveContent = false;
- }
- else if (sscanf(Val.c_str(),"bytes %llu-%*u/%llu",&StartPos,&Size) != 2)
+ if (Result == 416 && sscanf(Val.c_str(), "bytes */%llu",&TotalFileSize) == 1)
+ ; // we got the expected filesize which is all we wanted
+ else if (sscanf(Val.c_str(),"bytes %llu-%*u/%llu",&StartPos,&TotalFileSize) != 2)
return _error->Error(_("The HTTP server sent an invalid Content-Range header"));
- if ((unsigned long long)StartPos > Size)
+ if ((unsigned long long)StartPos > TotalFileSize)
return _error->Error(_("This HTTP server has broken range support"));
+
+ // figure out what we will download
+ DownloadSize = TotalFileSize - StartPos;
return true;
}
@@ -237,10 +245,21 @@ ServerState::ServerState(URI Srv, ServerMethod *Owner) : ServerName(Srv), TimeOu
Reset();
}
/*}}}*/
+bool ServerState::AddPartialFileToHashes(FileFd &File) /*{{{*/
+{
+ File.Truncate(StartPos);
+ return GetHashes()->AddFD(File, StartPos);
+}
+ /*}}}*/
bool ServerMethod::Configuration(string Message) /*{{{*/
{
- return pkgAcqMethod::Configuration(Message);
+ if (pkgAcqMethod::Configuration(Message) == false)
+ return false;
+
+ DropPrivsOrDie();
+
+ return true;
}
/*}}}*/
@@ -260,7 +279,7 @@ ServerMethod::DealWithHeaders(FetchResult &Res)
Res.LastModified = Queue->LastModified;
return IMS_HIT;
}
-
+
/* Redirect
*
* Note that it is only OK for us to treat all redirection the same
@@ -305,12 +324,31 @@ ServerMethod::DealWithHeaders(FetchResult &Res)
struct stat SBuf;
if (stat(Queue->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
{
- if ((unsigned long long)SBuf.st_size == Server->Size)
+ bool partialHit = false;
+ if (Queue->ExpectedHashes.usable() == true)
+ {
+ Hashes resultHashes(Queue->ExpectedHashes);
+ FileFd file(Queue->DestFile, FileFd::ReadOnly);
+ Server->TotalFileSize = file.FileSize();
+ Server->Date = file.ModificationTime();
+ resultHashes.AddFD(file);
+ HashStringList const hashList = resultHashes.GetHashStringList();
+ partialHit = (Queue->ExpectedHashes == hashList);
+ }
+ else if ((unsigned long long)SBuf.st_size == Server->TotalFileSize)
+ partialHit = true;
+ if (partialHit == true)
{
// the file is completely downloaded, but was not moved
- Server->StartPos = Server->Size;
- Server->Result = 200;
+ if (Server->HaveContent == true)
+ {
+ // Send to error page to dev/null
+ FileFd DevNull("/dev/null",FileFd::WriteExists);
+ Server->RunData(&DevNull);
+ }
Server->HaveContent = false;
+ Server->StartPos = Server->TotalFileSize;
+ Server->Result = 200;
}
else if (unlink(Queue->DestFile.c_str()) == 0)
{
@@ -335,7 +373,7 @@ ServerMethod::DealWithHeaders(FetchResult &Res)
// This is some sort of 2xx 'data follows' reply
Res.LastModified = Server->Date;
- Res.Size = Server->Size;
+ Res.Size = Server->TotalFileSize;
// Open the file
delete File;
@@ -348,7 +386,7 @@ ServerMethod::DealWithHeaders(FetchResult &Res)
FailFd = File->Fd();
FailTime = Server->Date;
- if (Server->InitHashes(*File) == false)
+ if (Server->InitHashes(Queue->ExpectedHashes) == false || Server->AddPartialFileToHashes(*File) == false)
{
_error->Errno("read",_("Problem hashing file"));
return ERROR_NOT_FROM_SERVER;
diff --git a/methods/server.h b/methods/server.h
index 7d5198478..8d7d33ee6 100644
--- a/methods/server.h
+++ b/methods/server.h
@@ -34,8 +34,16 @@ struct ServerState
char Code[360];
// These are some statistics from the last parsed header lines
- unsigned long long Size;
+
+ // total size of the usable content (aka: the file)
+ unsigned long long TotalFileSize;
+ // size we actually download (can be smaller than Size if we have partial content)
+ unsigned long long DownloadSize;
+ // size of junk content (aka: server error pages)
+ unsigned long long JunkSize;
+ // The start of the data (for partial content)
unsigned long long StartPos;
+
time_t Date;
bool HaveContent;
enum {Chunked,Stream,Closes} Encoding;
@@ -71,9 +79,10 @@ struct ServerState
};
/** \brief Get the headers before the data */
RunHeadersResult RunHeaders(FileFd * const File, const std::string &Uri);
+ bool AddPartialFileToHashes(FileFd &File);
bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
- virtual void Reset() {Major = 0; Minor = 0; Result = 0; Code[0] = '\0'; Size = 0;
+ virtual void Reset() {Major = 0; Minor = 0; Result = 0; Code[0] = '\0'; TotalFileSize = 0; JunkSize = 0;
StartPos = 0; Encoding = Closes; time(&Date); HaveContent = false;
State = Header; Persistent = false; Pipeline = true; MaximumSize = 0;};
virtual bool WriteResponse(std::string const &Data) = 0;
@@ -84,7 +93,7 @@ struct ServerState
virtual bool Open() = 0;
virtual bool IsOpen() = 0;
virtual bool Close() = 0;
- virtual bool InitHashes(FileFd &File) = 0;
+ virtual bool InitHashes(HashStringList const &ExpectedHashes) = 0;
virtual Hashes * GetHashes() = 0;
virtual bool Die(FileFd &File) = 0;
virtual bool Flush(FileFd * const File) = 0;
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 90ed92e3a..73b033876 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt 1.1~exp3\n"
+"Project-Id-Version: apt 1.0.9.7\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,144 +21,144 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr ""
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr ""
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr ""
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr ""
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr ""
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr ""
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr ""
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr ""
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr ""
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr ""
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr ""
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr ""
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr ""
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr ""
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr ""
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr ""
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr ""
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr ""
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr ""
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr ""
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr ""
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr ""
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr ""
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr ""
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr ""
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -195,20 +195,20 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr ""
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr ""
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -216,7 +216,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
@@ -240,83 +240,78 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, c-format
msgid "Can not find a package for architecture '%s'"
msgstr ""
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr ""
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr ""
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -324,137 +319,137 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr ""
@@ -521,11 +516,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr ""
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -539,52 +534,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr ""
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr ""
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr ""
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr ""
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr ""
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr ""
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr ""
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -801,7 +797,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr ""
@@ -890,36 +886,36 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr ""
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr ""
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr ""
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -929,31 +925,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr ""
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr ""
@@ -961,53 +957,289 @@ msgstr ""
msgid "Waiting for headers"
msgstr ""
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr ""
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr ""
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr ""
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr ""
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr ""
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr ""
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr ""
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr ""
+
+#: apt-private/private-output.cc:274
+msgid "[installed]"
+msgstr ""
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr ""
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr ""
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr ""
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr ""
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr ""
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr ""
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr ""
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr ""
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr ""
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr ""
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr ""
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr ""
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr ""
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr ""
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr ""
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr ""
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr ""
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr ""
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr ""
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1244,242 +1476,6 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr ""
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr ""
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:268
-msgid "[installed,local]"
-msgstr ""
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-msgid "[installed,automatic]"
-msgstr ""
-
-#: apt-private/private-output.cc:274
-msgid "[installed]"
-msgstr ""
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr ""
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr ""
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr ""
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr ""
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr ""
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr ""
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr ""
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr ""
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr ""
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr ""
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr ""
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr ""
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr ""
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr ""
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr ""
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr ""
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr ""
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr ""
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1533,19 +1529,23 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
+#, c-format
+msgid "Hit:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:88
-msgid "Get:"
+#, c-format
+msgid "Get:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:119
-msgid "Ign "
+#, c-format
+msgid "Ign:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:126
-msgid "Err "
+#, c-format
+msgid "Err:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:150
@@ -1569,17 +1569,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr ""
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1651,7 +1651,7 @@ msgstr ""
msgid "Merging available information"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1665,46 +1665,46 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, c-format
msgid "Unable to mkstemp %s"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1746,11 +1746,11 @@ msgid ""
" -o=? Set an arbitrary configuration option"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr ""
@@ -1859,22 +1859,22 @@ msgstr ""
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -1960,7 +1960,7 @@ msgstr ""
msgid "Failed to rename %s to %s"
msgstr ""
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -1974,11 +1974,11 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr ""
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2040,6 +2040,26 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr ""
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2052,173 +2072,294 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr ""
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr ""
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr ""
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr ""
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr ""
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr ""
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr ""
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr ""
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr ""
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr ""
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr ""
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr ""
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr ""
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr ""
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr ""
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr ""
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr ""
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr ""
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
+msgid "Index file type '%s' is not supported"
msgstr ""
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, c-format
-msgid "Is the package %s installed?"
+msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Failed to open StateFile %s"
+msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:217
#, c-format
-msgid "Failed to write temporary StateFile %s"
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr ""
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr ""
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:591
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
msgid "Invalid file format"
msgstr ""
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
msgid "Signature error"
msgstr ""
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2226,7 +2367,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
@@ -2242,170 +2383,102 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr ""
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, 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:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr ""
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr ""
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, c-format
-msgid "Clean of %s is not supported"
+msgid "Unable to lock directory %s"
msgstr ""
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr ""
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2427,19 +2500,19 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr ""
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2447,9 +2520,10 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
msgstr ""
#: apt-pkg/cdrom.cc:571
@@ -2515,11 +2589,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr ""
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr ""
@@ -2529,144 +2603,45 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:127
-#, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
msgstr ""
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
msgstr ""
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
msgstr ""
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
msgstr ""
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Malformed line %u in source list %s (type)"
+msgid "Failed to open StateFile %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Failed to write temporary StateFile %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid "Unable to parse package file %s (%d)"
msgstr ""
#: apt-pkg/cacheset.cc:501
@@ -2679,207 +2654,100 @@ msgstr ""
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr ""
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr ""
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr ""
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr ""
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Preparing to configure %s"
+msgid "Unable to parse Release file %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Installed %s"
+msgid "No sections in Release file %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Preparing for removal of %s"
+msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Removed %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Preparing to completely remove %s"
+msgid "Invalid 'Date' entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Completely removed %s"
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Can not write log (%s)"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
+msgid "%lis"
msgstr ""
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
+msgid "Selection %s not found"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:196
@@ -3015,35 +2883,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr ""
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr ""
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr ""
@@ -3103,107 +2942,263 @@ msgstr ""
msgid "Failed to stat the cdrom"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, c-format
+msgid "Can not write log (%s)"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr ""
@@ -3308,7 +3303,7 @@ msgstr ""
msgid "Internal error, could not locate member %s"
msgstr ""
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr ""
@@ -3337,23 +3332,23 @@ msgstr ""
msgid "Failed to read the archive headers"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr ""
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr ""
diff --git a/po/ar.po b/po/ar.po
index e93ae6810..3e71fef80 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2006-10-20 21:28+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -24,148 +24,148 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "الحزمة %s النسخة %s لها معتمد غير مستوفى:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "أسماء الحزم الكلية :"
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid "Total package structures: "
msgstr "أسماء الحزم الكلية :"
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " الحزم العادية:"
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr "الحزمة الوهمية تماماً:"
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " الحزمة الوهمية المفردة:"
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " الحزم الوهمية المختلطة:"
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " مفقودة:"
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "مجموع النسخ الفريدة:"
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
#, fuzzy
msgid "Total distinct descriptions: "
msgstr "مجموع النسخ الفريدة:"
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "مجموع المعتمدات:"
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "مجموع علاقات النسخ/الملفات:"
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
#, fuzzy
msgid "Total Desc/File relations: "
msgstr "مجموع علاقات النسخ/الملفات:"
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "مجموع علاقات النسخ/الملفات:"
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr ""
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr ""
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "مجموع المساحة المحسوب حسابها:"
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "لم يُعثر على أية حزم"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
#, fuzzy
msgid "You must give at least one search pattern"
msgstr "يجب أن تعطي صيغة واحدة بالضبط"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "تعذر العثور على الحزمة %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "ملفات الحزم:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "الحزم المُدبّسة:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(غير موجود)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " مُثبّت:"
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " مرشّح: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(لاشيء)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr ""
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " جدول النسخ:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, 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:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -202,21 +202,21 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "الرجاء كتابة اسم لهذا القرص، مثال 'Debian 2.1r1 Disk 1'"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "الرجاء إدخال قرص في السواقة وضغط الزر enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "فشل تغيير اسم %s إلى %s"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -224,7 +224,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "كرر هذه العملية لباقي الأقراص المدمجة في المجموعة."
@@ -248,83 +248,78 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "تعذر العثور على الحزمة %s"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "تعذر العثور على الحزمة %s"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "تعذر العثور على الحزمة %s"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "تعذر العثور على الحزمة %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "إلا أنه سيتم تثبيت %s"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "إلا أنه سيتم تثبيت %s"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "تعذر قفل دليل القائمة"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "تعذر قَفْل دليل التنزيل"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "تعذر العثور على مصدر الحزمة %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -332,137 +327,137 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "تخطي الملف '%s' المنزل مسبقاً\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "إحضار المصدر %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "فشل إحضار بعض الأرشيفات."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "اكتمل التنزيل وفي وضع التنزيل فقط"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "أمر فك الحزمة '%s' فشل.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "أمر البناء '%s' فشل.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr ""
@@ -530,11 +525,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -548,52 +543,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "إلا أنها غير مثبتة"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "إلا أنه سيتم تثبيت %s"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "إلا أنه سيتم تثبيت %s"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s هي النسخة الأحدث.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s هي النسخة الأحدث.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "إلا أنه سيتم تثبيت %s"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "فشل فتح %s"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -814,7 +810,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr "تعذر قبول الاتصال"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr ""
@@ -903,36 +899,36 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr "تعذر الاتصال بـ%s %s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr ""
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr ""
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -942,31 +938,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "خطأ في الكتابة إلى الملف"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "خطأ في القراءة من الخادم"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "خطأ في الكتابة إلى الملف"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "فشل التحديد"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "انتهى وقت الاتصال"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "خطأ في الكتابة إلى ملف المُخرجات"
@@ -974,53 +970,294 @@ msgstr "خطأ في الكتابة إلى ملف المُخرجات"
msgid "Waiting for headers"
msgstr "بانتظار الترويسات"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "سطر ترويسة سيء"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "أرسل خادم http ترويسة ردّ غير صالحة"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "أرسل خادم http ترويسة طول محتويات (ِContent-Length) غير صالحة"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "أرسل خادم http ترويسة مدى محتويات (ِContent-Range) غير صالحة"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "خادم http له دعم مدى معطوب"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "نسق تاريخ مجهول"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "بيانات ترويسة سيئة"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "فشل الاتصال"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "خطأ داخلي"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "تصحيح المعتمدات..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " فشل."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "لم يمكن تصحيح المعتمدات"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "لم يمكن تقليص مجموعة الترقية"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " تم"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [مُثبّتة]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [مُثبّتة]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [مُثبّتة]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [مُثبّتة]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "إلا أن %s مثبت"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "إلا أنه سيتم تثبيت %s"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "إلا أنه غير قابل للتثبيت"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "إلا أنها حزمة وهمية"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "إلا أنها غير مثبتة"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "إلا أنه لن يتم تثبيتها"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " أو"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "سيتم تثبيت الحزم الجديدة التالية:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "سيتم إزالة الحزم التالية:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "سيتم الإبقاء على الحزم التالية:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "ستتم ترقية الحزم التالية:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "سيتم تثبيط الحزم التالية:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "سيتم تغيير الحزم المبقاة التالية:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (بسبب %s) "
+
+#: apt-private/private-output.cc:696
+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"
+"لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu أعيد تثبيتها، "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu مثبطة، "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "لا يقبل الأمر update أية مُعطيات"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "خطأ داخلي، تم طلب InstallPackages مع وجود حزم معطوبة!"
@@ -1265,247 +1502,6 @@ msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
msgid "Package '%s' is not installed, so not removed\n"
msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "تصحيح المعتمدات..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " فشل."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "لم يمكن تصحيح المعتمدات"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "لم يمكن تقليص مجموعة الترقية"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " تم"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "قد ترغب بتنفيذ الأمر 'apt-get -f install' لتصحيح هذه."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "مُعتمدات غير مستوفاة. حاول استخدام -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [مُثبّتة]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [مُثبّتة]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [مُثبّتة]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [مُثبّتة]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "إلا أن %s مثبت"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "إلا أنه سيتم تثبيت %s"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "إلا أنه غير قابل للتثبيت"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "إلا أنها حزمة وهمية"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "إلا أنها غير مثبتة"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "إلا أنه لن يتم تثبيتها"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " أو"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "سيتم تثبيت الحزم الجديدة التالية:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "سيتم إزالة الحزم التالية:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "سيتم الإبقاء على الحزم التالية:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "ستتم ترقية الحزم التالية:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "سيتم تثبيط الحزم التالية:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "سيتم تغيير الحزم المبقاة التالية:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (بسبب %s) "
-
-#: apt-private/private-output.cc:696
-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"
-"لا يجب أن تقوم بهذا إلى إن كنت تعرف تماماً ما تقوم به!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu أعيد تثبيتها، "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu مثبطة، "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu لإزالتها و %lu لم يتم ترقيتها.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[y/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "لا يقبل الأمر update أية مُعطيات"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1559,20 +1555,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
+#, c-format
+msgid "Hit:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "جلب:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "جلب:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "تجاهل"
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "تجاهل:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "خطأ"
+#, c-format
+msgid "Err:%lu %s"
+msgstr "خطأ:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1598,17 +1598,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "تعذرت قراءة %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1682,7 +1682,7 @@ msgstr "أعلى هذه الرسالة مهمّة. الرجاء تصحيحها
msgid "Merging available information"
msgstr "دمج المعلومات المتوفرة"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1696,46 +1696,46 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "تعذر إنشاء %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "تعذرت الكتابة إلى %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "تعذر الحصول على نسخة debconf. هل هي مثبتة؟"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "قائمة توسيعات الحزمة طويلة جداً"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "خطأ في معالجة الدليل %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "قائمة توسيعات المصدر طويلة جداً"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "خطأ في كتابة الترويسة إلى ملف المحتويات"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "خطأ في معالجة المحتويات %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1777,11 +1777,11 @@ msgid ""
" -o=? Set an arbitrary configuration option"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "لم تُطابق أية تحديدات"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "بعض الملفات مفقودة في مجموعة ملف الحزمة `%s'"
@@ -1891,22 +1891,22 @@ msgstr ""
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -1992,7 +1992,7 @@ msgstr ""
msgid "Failed to rename %s to %s"
msgstr "فشل تغيير اسم %s إلى %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2006,11 +2006,11 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "سجل حزمة مجهول!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2072,6 +2072,26 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "MD5Sum غير متطابقة"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "الرجاء إدخال القرص المُسمّى '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2084,177 +2104,297 @@ msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح
msgid "The list of sources could not be read."
msgstr "تعذرت قراءة قائمة المصادر."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr ""
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr ""
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr ""
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr ""
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr ""
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr ""
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "يعتمد"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "يعتمد مسبقاً"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "يستحسن"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "يقترح"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "يعارض"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "يستبدل"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "يُلغي"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "مهم"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "مطلوب"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "قياسي"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "اختياري"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "إضافي"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "حساب الترقية"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
+msgid "Index file type '%s' is not supported"
msgstr ""
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, c-format
-msgid "Is the package %s installed?"
+msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "الرجاء إدخال القرص المُسمّى '%s' في السوّاقة '%s' وضغط مفتاح الإدخال."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "دمج المعلومات المتوفرة"
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr ""
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "فتح %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "فشل فتح %s"
+msgid "Clean of %s is not supported"
+msgstr "نظام الحزم '%s' غير مدعوم"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr ""
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "فشلت كتابة الملف %s"
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:591
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "قراءة قوائم الحزم"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "فشل إعادة التسمية ، %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum غير متطابقة"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "الحجم غير متطابق"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "عمليّة غير صالحة %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "خطأ في الكتابة"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2262,7 +2402,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
@@ -2278,170 +2418,102 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, 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:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr ""
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "قراءة قوائم الحزم"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr ""
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "نظام الحزم '%s' غير مدعوم"
+msgid "Unable to lock directory %s"
+msgstr "تعذر قفل دليل القائمة"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr ""
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2463,19 +2535,19 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "فشل إغلاق الملف %s"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2483,9 +2555,10 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
msgstr ""
#: apt-pkg/cdrom.cc:571
@@ -2553,11 +2626,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "نسخ قوائم الحزم..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "كتابة لائحة المصادر الجديدة\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr ""
@@ -2567,144 +2640,46 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
msgstr ""
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
msgstr ""
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
msgstr ""
-#: apt-pkg/indexrecords.cc:83
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "دمج المعلومات المتوفرة"
-#: apt-pkg/indexrecords.cc:152
+#: apt-pkg/depcache.cc:252
#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "لاحظ، تحديد %s بدلاً من %s\n"
+msgid "Failed to open StateFile %s"
+msgstr "فشل فتح %s"
-#: apt-pkg/indexrecords.cc:171
+#: apt-pkg/depcache.cc:258
#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "فتح %s"
-
-#: apt-pkg/sourcelist.cc:371
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:375
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
+msgid "Failed to write temporary StateFile %s"
+msgstr "فشلت كتابة الملف %s"
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid "Unable to parse package file %s (%d)"
msgstr ""
#: apt-pkg/cacheset.cc:501
@@ -2717,208 +2692,101 @@ msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
msgid "Version '%s' for '%s' was not found"
msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "تعذر العثور على الحزمة %s"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "تعذر العثور على الحزمة %s"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "تعذر العثور على الحزمة %s"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
+#: apt-pkg/indexrecords.cc:83
#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "تم تثبيت %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "تهيئة %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "إزالة %s"
+msgid "Unable to parse Release file %s"
+msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/indexrecords.cc:91
#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "تمت إزالة %s بالكامل"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr ""
+msgid "No sections in Release file %s"
+msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Directory '%s' missing"
+msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/indexrecords.cc:145
#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "فشل إغلاق الملف %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "تحضير %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "فتح %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "التحضير لتهيئة %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1012
-#, c-format
-msgid "Installed %s"
-msgstr "تم تثبيت %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1017
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr "التحضير لإزالة %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, c-format
-msgid "Removed %s"
-msgstr "تم إزالة %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "التحضير لإزالة %s بالكامل"
-
-#: apt-pkg/deb/dpkgpm.cc:1025
-#, c-format
-msgid "Completely removed %s"
-msgstr "تمت إزالة %s بالكامل"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "لاحظ، تحديد %s بدلاً من %s\n"
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
+#: apt-pkg/indexrecords.cc:164
#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "تعذرت الكتابة إلى %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
+#, c-format
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "تعذر قفل دليل القائمة"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "%lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
+msgstr "تعذر العثور على التحديد %s"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3053,35 +2921,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... تمّ"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "تعذر العثور على التحديد %s"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr ""
@@ -3144,107 +2983,263 @@ msgstr ""
msgid "Failed to stat the cdrom"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "اختصار نوع مجهول: '%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "فتح ملف التهيئة %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "خيار سطر الأمر '%c' [من %s] مجهول."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "خيار سطر الأمر %s غير مفهوم"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "الخيار %s يتطلّب مُعطى."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "الخيار '%s' طويل جداً"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "عمليّة غير صالحة %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "تم تثبيت %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "تهيئة %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "إزالة %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "تمت إزالة %s بالكامل"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "فشل إغلاق الملف %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "تحضير %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "فتح %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "التحضير لتهيئة %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "تم تثبيت %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "التحضير لإزالة %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "تم إزالة %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "التحضير لإزالة %s بالكامل"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "تمت إزالة %s بالكامل"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "تعذرت الكتابة إلى %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "تعذر قفل دليل القائمة"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr ""
@@ -3349,7 +3344,7 @@ msgstr ""
msgid "Internal error, could not locate member %s"
msgstr "خطأ داخلي، تعذر العثور على العضو %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr ""
@@ -3378,23 +3373,23 @@ msgstr "الأرشيف قصير جداً"
msgid "Failed to read the archive headers"
msgstr "فشلت قراءة ترويسات الأرشيف"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "فشل تنفيذ gzip"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "أرشيف فاسد"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "فشل تحقّق Checksum لملف Tar، الأرشيف فاسد"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr ""
diff --git a/po/ast.po b/po/ast.po
index 04ca3911b..1995c12f6 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.18\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2010-10-02 23:35+0100\n"
"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
"Language-Team: Asturian (ast)\n"
@@ -20,145 +20,145 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "El paquete %s versión %s nun cumple una dependencia:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Total de nomes de paquetes: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Total de cadarmes de paquetes: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Paquetes normales: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Paquetes virtuales puros: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Paquetes virtuales cenciellos: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Paquetes virtuales amestaos: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Falten: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Versiones distintes en total: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Descripciones distintes en total: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Dependencies totales: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Rellaciones versión/ficheru en total: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Rellaciones descripción/ficheru en total: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Mapes de provisiones en total: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Cadenes globalizaes en total: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Espaciu ociosu en total: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Informe del total d'espaciu: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "El ficheru de paquetes %s nun ta sincronizáu."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Nun s'alcontraron paquetes"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Has de dar polo menos un patrón de gueta"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Nun pue alcontrase'l paquete %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Ficheros de paquete:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
"La caché nun ta sincronizada, nun puede facese x-ref a un ficheru de paquete"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Paquetes na chincheta:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(nun s'alcontró)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Instaláu: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Candidatu: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(dengún)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Chincheta de paquetes: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Tabla de versiones:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pa %s compiláu en %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -234,20 +234,20 @@ msgstr ""
"tmp\n"
"Ver les páxines del manual apt-cache(8) y apt.conf(5) pa más información.\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Da-y un nome a esti discu, como 'Debian 5.0.3 Discu 1'"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Inxerta un discu nel preséu y calca intro"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Falló al montar '%s' a '%s'"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -255,7 +255,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Repite'l procesu colos demás CDs del conxuntu."
@@ -291,76 +291,71 @@ msgstr ""
" -c=? Llee esti ficheru de configuración\n"
" -o=? Conseña una opción de configuración arbitraria, p. ex.\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Tomando '%s' como paquetes d'oríxenes en llugar de '%s'\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Inorar versión non disponible de '%s' del paquete '%s'"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Nun pudo alcontrase'l paquete %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s axustáu como instaláu manualmente.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s axustáu como instaláu automáticamente.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Error internu, l'iguador de problemes frañó coses"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Nun pudo bloquiase'l direutoriu %s"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Nun pue bloquiase'l direutoriu de descarga"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "Has de conseñar polo menos un paquete p'algamar so fonte"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nun pudo alcontrase un paquete fonte pa %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -369,7 +364,7 @@ msgstr ""
"AVISU: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -381,96 +376,96 @@ msgstr ""
"pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal "
"paquete.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Saltando'l ficheru yá descargáu '%s'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Hai falta descargar %sB d'archivos fonte.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Fonte descargada %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Falló la descarga de dellos archivos."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en mou de sólo descarga"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Saltando'l desempaquetáu de la fonte yá desempaquetada en %s\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Falló la orde de desempaquetáu '%s'.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Falló la orde build '%s'.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Falló el procesu fíu"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Hai que conseñar polo menos un paquete pa verificar les dependencies de "
"construcción"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Fallu al procesar les dependencies de construcción"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nun pudo algamase información de dependencies de construcción pa %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nun tien dependencies de construcción.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -479,7 +474,7 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
"paquete %s"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -488,14 +483,14 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
"paquete %s"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nun se pudo satisfacer la dependencia %s pa %s: El paquete instaláu %s ye "
"enforma nuevu"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -504,7 +499,7 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque denguna versión "
"disponible del paquete %s satisfaz los requisitos de versión"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -513,17 +508,17 @@ msgstr ""
"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
"paquete %s"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Les dependencies de construcción de %s nun pudieron satisfacese."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Fallu al procesar les dependencies de construcción"
@@ -636,11 +631,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Has de conseñar polo menos un paquete p'algamar so fonte"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -654,52 +649,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "pero nun ta instaláu"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s axustáu como instaláu manualmente.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s axustáu como instaláu automáticamente.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s yá ta na versión más nueva.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s yá ta na versión más nueva.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperaba %s pero nun taba ellí"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "%s axustáu como instaláu manualmente.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "Nun pudo abrise %s"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -920,7 +916,7 @@ msgstr "Gandió'l tiempu de conexón col zócalu de datos"
msgid "Unable to accept connection"
msgstr "Nun se pudo aceptar la conexón"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Hebo un problema al xenerar el hash del ficheru"
@@ -1009,38 +1005,38 @@ msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Nun pudo coneutase a %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Fallu internu: Robla bona, pero nun se pudo determinar la so buelga dixital?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Atopóse polo menos una robla mala."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"Nun pudo executase 'apt-key' pa verificar la robla (¿ta instaláu gnupg?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Fallu desconocíu al executar apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Les siguientes robles nun valieron:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1052,31 +1048,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Fallu al escribir nel ficheru"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Fallu al lleer nel sirvidor. El llau remotu zarró la conexón."
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Fallu al lleer nel sirvidor"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Fallu al escribir nel ficheru"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Falló la escoyeta"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Gandió'l tiempu de conexón"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Fallu al escribir nel ficheru de salida"
@@ -1084,53 +1080,299 @@ msgstr "Fallu al escribir nel ficheru de salida"
msgid "Waiting for headers"
msgstr "Esperando les testeres"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Fallu na llinia testera"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "El sirvidor HTTP mandó una testera incorreuta de rempuesta"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "El sirvidor HTTP mandó una testera incorreuta de Content-Length"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "El sirvidor HTTP mandó una testera incorreuta de Content-Range"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Formatu de data desconocíu"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Datos de testera incorreutos"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Fallo la conexón"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Fallu internu"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Iguando dependencies..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " falló."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Nun pudieron iguase les dependencies"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Nun pue amenorgase'l conxuntu d'actualización"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Fecho"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Habríes d'executar 'apt-get -f install' para igualo."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependencies incumplíes. Téntalo usando -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instaláu]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instaláu]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instaláu]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instaláu]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "pero %s ta instaláu"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "pero %s ta pa instalar"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "pero nun ye instalable"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "pero ye un paquete virtual"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "pero nun ta instaláu"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "pero nun va instalase"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " o"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Los siguientes paquetes nun cumplen dependencies:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Van instalase los siguientes paquetes NUEVOS:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Los siguientes paquetes van DESANICIASE:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Los siguientes paquetes tan reteníos:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Los siguientes paquetes van actualizase:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Los siguientes paquetes van DESACTUALIZASE:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Van camudase los siguientes paquetes reteníos:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (por %s) "
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"AVISU: Los siguientes paquetes esenciales van desaniciase.\n"
+"¡Esto NUN hai que facelo si nun sabes esautamente lo que faes!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu actualizaos, %lu nuevos instalaos, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalaos, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu desactualizaos, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu para desaniciar y %lu nun actualizaos.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Error de compilación d'espresión regular - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "La orde update nun lleva argumentos"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"NOTA: ¡Esto sólo ye una simulación!\n"
+" apt-get necesita privilexos de root pa la execución real.\n"
+" ¡Ten tamién en cuenta que'l bloquéu ta desactiváu,\n"
+" asina que nun dependen de la pertinencia de la verdadera situación "
+"actual!"
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Error internu, ¡InstallPackages llamose con paquetes frañaos!"
@@ -1389,252 +1631,6 @@ msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
msgid "Package '%s' is not installed, so not removed\n"
msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Iguando dependencies..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " falló."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Nun pudieron iguase les dependencies"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Nun pue amenorgase'l conxuntu d'actualización"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Fecho"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Habríes d'executar 'apt-get -f install' para igualo."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependencies incumplíes. Téntalo usando -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instaláu]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instaláu]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instaláu]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instaláu]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "pero %s ta instaláu"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "pero %s ta pa instalar"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "pero nun ye instalable"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "pero ye un paquete virtual"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "pero nun ta instaláu"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "pero nun va instalase"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " o"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Los siguientes paquetes nun cumplen dependencies:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Van instalase los siguientes paquetes NUEVOS:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Los siguientes paquetes van DESANICIASE:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Los siguientes paquetes tan reteníos:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Los siguientes paquetes van actualizase:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Los siguientes paquetes van DESACTUALIZASE:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Van camudase los siguientes paquetes reteníos:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (por %s) "
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"AVISU: Los siguientes paquetes esenciales van desaniciase.\n"
-"¡Esto NUN hai que facelo si nun sabes esautamente lo que faes!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu actualizaos, %lu nuevos instalaos, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalaos, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu desactualizaos, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu para desaniciar y %lu nun actualizaos.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nun instalaos dafechu o desaniciaos.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Error de compilación d'espresión regular - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "La orde update nun lleva argumentos"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"NOTA: ¡Esto sólo ye una simulación!\n"
-" apt-get necesita privilexos de root pa la execución real.\n"
-" ¡Ten tamién en cuenta que'l bloquéu ta desactiváu,\n"
-" asina que nun dependen de la pertinencia de la verdadera situación "
-"actual!"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1688,20 +1684,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Oxe "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Oxe:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Des:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Des:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1727,17 +1727,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Nun ye a lleer %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1814,7 +1814,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Fusionando información disponible"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1839,46 +1839,46 @@ msgstr ""
"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Nun ye a lleer %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Nun se pue escribir en %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nun se pue alcontrar la versión de debconf. ¿Ta instaláu debconf?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "La llista d'estensión de paquetes ye enforma llarga"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Error al procesar el direutoriu %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "La llista d'estensión de fontes ye enforma llarga"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Error al escribir la cabecera al ficheru de conteníos"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Error al procesar conteníos %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1959,11 +1959,11 @@ msgstr ""
" -c=? Lleer esti ficheru de configuración\n"
" -o=? Afita una escoyeta de configuración propia"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Nun concasó denguna seleición"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Falten dellos ficheros nel grupu de ficheros de paquete `%s'"
@@ -2075,22 +2075,22 @@ msgstr " Alcanzose'l llímite of %sB de desenllaz.\n"
msgid "Archive had no package field"
msgstr "L'archivu nun tien el campu paquetes"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nun tien la entrada saltos\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el curiador de %s ye %s y non %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nun tien la entrada saltos de fonte\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampoco nun tiene una entrada binaria de saltos\n"
@@ -2176,7 +2176,7 @@ msgstr "Problema al desenllazar %s"
msgid "Failed to rename %s to %s"
msgstr "Nun pudo renomase %s como %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2202,11 +2202,11 @@ msgstr ""
"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "¡Rexistru de paquetes desconocíu!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2281,6 +2281,26 @@ msgstr "Nun puede alcontrase'l rexistru d'autenticación pa: %s"
msgid "Hash mismatch for: %s"
msgstr "El hash nun concasa pa: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Nun pudo alncontrase'l controlador de métodu %s."
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "El métodu %s nun entamó correchamente"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Por favor, introduz el discu '%s' nel preséu '%s' y calca Intro."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2294,176 +2314,301 @@ msgstr "Has d'executar apt-get update pa iguar estos problemes"
msgid "The list of sources could not be read."
msgstr "Nun pudo lleese la llista de fontes."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Caché de paquetes balera."
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "El ficheru de caché de paquetes ta tollíu"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "El ficheru de caché de paquetes ye una versión incompatible"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "El ficheru de caché de paquetes ta tollíu"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Esti APT nun soporta'l sistema de versiones '%s'"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "La caché de paquetes creóse pa una arquitectura estremada"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Depende de"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Predepende de"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Suxer"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Recomienda"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "En conflictu con"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Sustituye a"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Fai obsoletu a"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Ruempe"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Aumenta"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "importante"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "requeríu"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "estándar"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "opcional"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "extra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Calculando l'anovamientu"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Nun pudo alncontrase'l controlador de métodu %s."
+msgid "Index file type '%s' is not supported"
+msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El métodu %s nun entamó correchamente"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Llinia %lu mal formada na llista d'oríxe %s ([opción] nun parcheable)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Por favor, introduz el discu '%s' nel preséu '%s' y calca Intro."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+"Llinia %lu mal formada na llista d'oríxenes %s ([option] enforma curtia)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+"Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun ye una asignación)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun tien clave)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Llinia %lu mal formada na llista d'oríxenes %s ([%s] clave %s nun tien valor)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Llinia %lu mal formada na llista d'oríxenes %s (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist absoluta)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís de dist)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Abriendo %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Llinia %u enforma llarga na llista d'oríxenes %s."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Creando árbol de dependencies"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nun pudo lleese %s."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versiones candidates"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "La caché tien un sistema de versiones incompatible"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Xeneración de dependencies"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Hebo un error al procesar %s (FindPkg)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Lleendo información d'estáu"
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Coime, perpasaste'l númberu de nomes de paquete qu'esti APT ye a remanar."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Vaya, perpasaste'l númberu de versiones coles que puede esti APT."
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Coime, perpasaste'l númberu de descripciones qu'esti APT ye a remanar."
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Vaya, perpasaste'l númberu de dependencies coles que puede esti APT."
+
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nun se pudo abrir el ficheru d'estáu %s"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Al procesar dependencies de ficheros nun s'alcontró el paquete %s %s"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falló la escritura del ficheru temporal d'estáu %s"
+msgid "Couldn't stat source package list %s"
+msgstr "Nun se puede lleer la llista de paquetes d'oríxenes %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Lleendo llista de paquetes"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Recoyendo ficheros qu'apurren"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Fallu de E/S al grabar caché d'oríxenes"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "falló'l cambiu de nome, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "La suma hash nun concasa"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "El tamañu nun concasa"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Operación incorreuta: %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Fallu d'escritura"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2473,7 +2618,7 @@ msgstr ""
"anováu y va usase un ficheru índiz. Fallu GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "Fallu GPG: %s: %s"
@@ -2489,49 +2634,49 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nun se pudo parchear el ficheru release %s"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nun hai clave pública denguna disponible pa les IDs de clave darréu:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2540,12 +2685,12 @@ msgstr ""
"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
"necesites iguar manualmente esti paquete (por faltar una arquitectura)"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2553,114 +2698,42 @@ msgstr ""
"Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal "
"paquete %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "La caché tien un sistema de versiones incompatible"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Hebo un error al procesar %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Coime, perpasaste'l númberu de nomes de paquete qu'esti APT ye a remanar."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Vaya, perpasaste'l númberu de versiones coles que puede esti APT."
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Coime, perpasaste'l númberu de descripciones qu'esti APT ye a remanar."
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Vaya, perpasaste'l númberu de dependencies coles que puede esti APT."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Al procesar dependencies de ficheros nun s'alcontró el paquete %s %s"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nun se puede lleer la llista de paquetes d'oríxenes %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Lleendo llista de paquetes"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Recoyendo ficheros qu'apurren"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Fallu de E/S al grabar caché d'oríxenes"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "El bloque de fornidor %s nun contién una buelga dixital"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Falta'l direutoriu de llistes %spartial."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Falta'l direutoriu d'archivos %spartial."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "Nun pudo bloquiase'l direutoriu %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Descargando ficheru %li de %li (falten %s)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Descargando ficheru %li de %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Nun pudieron descargase dellos ficheros d'índiz; inoráronse o usáronse los "
-"antiguos nel so llugar."
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Has de poner delles URIs 'fonte' nel ficheru sources.list"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nun pudo lleese %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2683,7 +2756,7 @@ msgstr "Nun s'entiende'l tipu de pin %s"
msgid "No priority (or zero) specified for pin"
msgstr "Nun hai prioridá (o ye cero) conseñada pa pin"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2692,12 +2765,12 @@ msgstr ""
"Nun pudó facese la configuración inmediatamente en '%s'. Por favor, mira man "
"5 apt.conf embaxo APT::Immediate-Configure for details. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "Nun pudo abrise'l ficheru '%s'"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2708,10 +2781,14 @@ msgstr ""
"esencial %s por un cote de Conflictos/Pre-Dependencies. Esto normalmente ye "
"malo, pero si daveres quies facelo, activa la opción APT::Force-LoopBreak."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Llinia %u enforma llarga na llista d'oríxenes %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Nun pudieron descargase dellos ficheros d'índiz; inoráronse o usáronse los "
+"antiguos nel so llugar."
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2782,11 +2859,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Copiando les llistes de paquetes..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Escribiendo llista nueva d'oríxenes\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Les entraes de la llista d'oríxenes pa esti discu son:\n"
@@ -2797,7 +2874,7 @@ msgid ""
msgstr ""
"El paquete %s necesita reinstalase, pero nun s'alcuentra un archivu pa el."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2805,142 +2882,40 @@ msgstr ""
"Error, pkgProblemResolver::Resolve xeneró frañadures, esto puede ser pola "
"mor de paquetes reteníos."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nun se pudo parchear el ficheru release %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Ensin seiciones nel ficheru release %s"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ensin entrada Hash nel ficheru release %s"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Entrada inválida pa 'Valid-Until' nel ficheru release %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Entrada inválida pa 'Date' nel ficheru release %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Llinia %lu mal formada na llista d'oríxe %s ([opción] nun parcheable)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Llinia %lu mal formada na llista d'oríxenes %s ([option] enforma curtia)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun ye una asignación)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Llinia %lu mal formada na llista d'oríxenes %s ([%s] nun tien clave)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Llinia %lu mal formada na llista d'oríxenes %s ([%s] clave %s nun tien valor)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Llinia %lu mal formada na llista d'oríxenes %s (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Creando árbol de dependencies"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís d'URI)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versiones candidates"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Llinia %lu mal formada na llista d'oríxenes %s (dist absoluta)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Xeneración de dependencies"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Llinia %lu mal formada na llista d'oríxenes %s (analís de dist)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lleendo información d'estáu"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "Abriendo %s"
+msgid "Failed to open StateFile %s"
+msgstr "Nun se pudo abrir el ficheru d'estáu %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falló la escritura del ficheru temporal d'estáu %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
-
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Triba '%s' desconocida na llinia %u de la llista d'oríxenes %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Nun se pudo tratar el ficheru de paquetes %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2952,48 +2927,48 @@ msgstr "Nun s'alcontró la distribución '%s' pa '%s'"
msgid "Version '%s' for '%s' was not found"
msgstr "Nun s'alcontró la versión '%s' pa '%s'"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Nun pudo alcontrase la xera '%s'"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Nun pudo alcontrase dengún paquete por regex '%s'"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Nun pueden seleicionase versiones pal paquete'%s' como puramente virtual"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Nun puede seleicionase la versión más nueva pal paquete'%s' como puramente "
"virtual"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Nun puede seleicionase versión candidata pal paquete %s que nun tien "
"candidata"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Nun puede seleicionase versión instalada pal paquete %s que nun ta instalada"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3002,181 +2977,59 @@ msgstr ""
"Nun puede seleicionase l'instalador o versión candidata pal paquete '%s' "
"como non tien nengún d'ellos"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Instalando %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Configurando %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Desinstalando %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "Desinstalóse dafechu %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Anotando desaniciáu de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Executando activador de post-instalación de %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Falta'l direutoriu '%s'."
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Nun pudo abrise'l ficheru '%s'"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Preparando %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Unpacking %s"
-msgstr "Desempaquetando %s"
+msgid "Unable to parse Release file %s"
+msgstr "Nun se pudo parchear el ficheru release %s"
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Preparing to configure %s"
-msgstr "Preparándose pa configurar %s"
+msgid "No sections in Release file %s"
+msgstr "Ensin seiciones nel ficheru release %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Installed %s"
-msgstr "%s instaláu"
+msgid "No Hash entry in Release file %s"
+msgstr "Ensin entrada Hash nel ficheru release %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Preparándose pa desinstalar %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Entrada inválida pa 'Valid-Until' nel ficheru release %s"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Removed %s"
-msgstr "%s desinstaláu"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Entrada inválida pa 'Date' nel ficheru release %s"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Preparándose pa desinstalar dafechu %s"
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Completely removed %s"
-msgstr "Desinstalóse dafechu %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Nun se pue escribir en %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr "Ensin informe escritu d'apport porque MaxReports llegó dafechu"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "problemes de dependencies - déxase ensin configurar"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu que "
-"siguió dende un fallu previu"
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
-"discu llenu"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
-"memoria"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
-"discu llenu"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu E/S "
-"dpkg"
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Nun pudó bloquease'l direutoriu d'alministración (%s), ¿hai otru procesu "
-"usándolu?"
+msgid "%limin %lis"
+msgstr "%limin %lis"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Nun pudo bloquiase'l direutoriu d'alministración (%s), ¿yes root?"
+msgid "%lis"
+msgstr "%lis"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"dpkg interrumpióse, tienes qu'executar manualmente '%s' pa iguar el "
-"problema. "
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Non bloquiáu"
+msgid "Selection %s not found"
+msgstr "Escoyeta %s que nun s'atopa"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3311,35 +3164,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Fecho"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Escoyeta %s que nun s'atopa"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Nun se puede facer mmap d'un ficheru baleru"
@@ -3404,110 +3228,281 @@ msgstr "Nun puede algamase información del puntu de montaxe %s"
msgid "Failed to stat the cdrom"
msgstr "Nun se pudo montar el CD-ROM"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Triba d'abreviatura que nun se reconoz: «%c»"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Abriendo ficheros de configuración %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Fallu de sintaxis %s:%u: Nun hai un nome al entamu del bloque."
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Fallu de sintaxis %s:%u: Marca mal formada"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Fallu de sintaxis %s:%u: Puxarra extra dempués del valor"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Error de sintaxis %s:%u: Les directives pueden facese sólo nel nivel cimeru"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Fallu de sintaxis %s:%u: Demasiaes inclusiones añeraes"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Fallu de sintaxis %s:%u: Incluyendo dende equí"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Error de sintaxis %s:%u: La directiva '%s' nun ta sofitada"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Fallu de sintaxis %s:%u: Directiva llimpia requier un tres opciones como "
"argumentos"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Fallu de sintaxis %s:%u: Puxarra extra al final del ficheru"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "La opción de llinia d'ordes '%c' [de %s] ye desconocida."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Nun s'entiende la opción %s de la llinia d'ordes"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "La opción %s de la llinia d'ordes nun ye un valor booleanu"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "La opción %s necesita un argumentu."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Opción %s: L'axuste del elementu de configuración ha tener un =<val>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "La opción %s pide un argumentu enteru, non '%s'"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Opción '%s' enforma llarga"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "El sentíu %s nun s'entiende, prueba con braeru o falsu."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Operación incorreuta: %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Instalando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Configurando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Desinstalando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "Desinstalóse dafechu %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Anotando desaniciáu de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Executando activador de post-instalación de %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Falta'l direutoriu '%s'."
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Nun pudo abrise'l ficheru '%s'"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Preparando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Desempaquetando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Preparándose pa configurar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "%s instaláu"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Preparándose pa desinstalar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "%s desinstaláu"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Preparándose pa desinstalar dafechu %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "Desinstalóse dafechu %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Nun se pue escribir en %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr "Ensin informe escritu d'apport porque MaxReports llegó dafechu"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "problemes de dependencies - déxase ensin configurar"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu que "
+"siguió dende un fallu previu"
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
+"discu llenu"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
+"memoria"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu de "
+"discu llenu"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Ensin informe escritu d'apport porque'l mensax de fallu indica un fallu E/S "
+"dpkg"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Nun pudó bloquease'l direutoriu d'alministración (%s), ¿hai otru procesu "
+"usándolu?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nun pudo bloquiase'l direutoriu d'alministración (%s), ¿yes root?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"dpkg interrumpióse, tienes qu'executar manualmente '%s' pa iguar el "
+"problema. "
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Non bloquiáu"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "Llamóse a DropNode nun nodu que ta entá enllazáu"
@@ -3612,7 +3607,7 @@ msgstr "Esti nun ye un ficheru DEB válidu, falta'l miembru '%s'"
msgid "Internal error, could not locate member %s"
msgstr "Error internu, nun se pue atopar el miembru %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Ficheru de control inanalizable"
@@ -3641,23 +3636,23 @@ msgstr "El ficheru ye perpequeñu"
msgid "Failed to read the archive headers"
msgstr "Falló al lleer les testeres del ficheru"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Fallu al crear les tuberíes"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Fallu al executar gzip "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Ficheru tollíu"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Falló la suma de control de tar, ficheru tollíu"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Testera del TAR triba %u desconocida, miembru %s"
diff --git a/po/bg.po b/po/bg.po
index d32f73789..7dff005e6 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.21\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2012-06-25 17:23+0300\n"
"Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -26,145 +26,145 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Пакетът %s версия %s има неудовлетворена зависимост:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Общо имена на пакети : "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Общо пакетни структури: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Нормални пакети: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Чисти виртуални пакети: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Единични виртуални пакети: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Смесени виртуални пакети: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Липсващи: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Общо уникални версии: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Общо уникални описания: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Общо зависимости: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Общо отношения версия/файл: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Общо отношения описание/файл: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Общо отношения „Осигурява“: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Общо разгърнати низове: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Общо празно пространство: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Общо отчетено пространство: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Пакетният файл %s не е синхронизиран."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Няма намерени пакети"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Трябва да въведете поне един шаблон за търсене"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Тази командата е остаряла. Използвайте „apt-mark showauto“ вместо нея."
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Пакетът %s не може да бъде намерен"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Пакетни файлове:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
"Кешът не е синхронизиран, не може да се изпълни „x-ref“ на пакетен файл"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Отбити пакети:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(не са намерени)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Инсталирана: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Кандидат: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(няма)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Отбиване на пакета: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Таблица с версиите:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s за %s компилиран на %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -235,20 +235,20 @@ msgstr ""
"cache=/tmp\n"
"За повече информация вижте наръчниците apt-cache(8) и apt.conf(5).\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Укажете име за този диск, например „Debian 5.0.3 Disk1“"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Сложете диск в устройството и натиснете „Enter“"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Неуспех при монтиране на %s на %s"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -256,7 +256,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Повторете този процес за останалите дискове от комплекта."
@@ -293,48 +293,48 @@ msgstr ""
" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Използване на пакет източник „%s“ вместо „%s“\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Игнориране на несъществуваща версия „%s“ на пакета „%s“"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Неуспех при намирането на пакет %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s е отбелязан като ръчно инсталиран.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s е отбелязан като автоматично инсталиран.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -342,29 +342,24 @@ msgstr ""
"Тази команда е остаряла. Вместо нея използвайте „apt-mark auto“ и „apt-mark "
"manual“."
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Неуспех при заключване на директорията %s"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Неуспех при заключването на директорията за изтегляне"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Неуспех при намирането на изходен код на пакет %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -374,7 +369,7 @@ msgstr ""
"адрес:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -386,69 +381,69 @@ msgstr ""
"за да изтеглите последните промени в пакета (евентуално в процес на "
"разработка).\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускане на вече изтегления файл „%s“\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Изтегляне на изходен код %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Неуспех при изтеглянето на някои архиви."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Изтеглянето завърши в режим само на изтегляне"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Командата за разпакетиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Командата за компилиране „%s“ пропадна.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Процесът-потомък пропадна"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -457,28 +452,28 @@ msgstr ""
"Липсва информация за архитектурата %s. Прегледайте информацията за APT::"
"Architectures в apt.conf(5)."
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Неуспех при обработката на зависимостите за компилиране"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Неуспех при получаването на информация за зависимостите за компилиране на %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s няма зависимости за компилиране.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -487,7 +482,7 @@ msgstr ""
"Зависимост %s за пакета %s не може да бъде удовлетворена, %s не се позволява "
"за пакети „%s“"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -496,14 +491,14 @@ msgstr ""
"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
"не може да бъде намерен"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният "
"пакет %s е твърде нов"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -512,7 +507,7 @@ msgstr ""
"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже версията "
"кандидат на пакета %s не може да удовлетвори изискването за версия"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -521,17 +516,17 @@ msgstr ""
"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
"няма подходящи версии"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Неуспех при обработката на зависимостите за компилиране"
@@ -643,11 +638,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -661,52 +656,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "Пакетът „%s“ не може да бъде маркиран, защото не е инсталиран.\n"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr "Пакетът „%s“ вече е отбелязан като ръчно инсталиран.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "Пакетът „%s“ вече е отбелязан като автоматично инсталиран.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr "Пакетът „%s“ вече е задуржан.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr "Пакетът „%s“ вече е задържан.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Изчака се завършването на %s, но той не беше пуснат"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr "Пакетът „%s“ е задържан.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "Отмяна на задържането на пакета „%s“.\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr "Неуспех при изпълняване на dpkg. Имате ли административни права?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -949,7 +945,7 @@ msgstr "Времето за установяване на връзка с гне
msgid "Unable to accept connection"
msgstr "Невъзможно е да се приеме свързването"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Проблем при хеширане на файла"
@@ -1038,40 +1034,40 @@ msgstr "Нещо лошо се случи при намирането на IP а
msgid "Unable to connect to %s:%s:"
msgstr "Неуспех при свързване с %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на "
"ключа?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Намерен е поне един невалиден подпис."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"Неуспех при изпълнение на „apt-key“ за проверка на подписа (инсталиран ли е "
"gnupg?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Неизвестна грешка при изпълнението на apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Следните подписи са невалидни:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1083,31 +1079,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr "Празни файлове не могат да бъдат валидни архиви"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Грешка при записа на файла"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Грешка при четене от сървъра"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Грешка при записа на файл"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Неуспех на избора"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Допустимото време за свързване изтече"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Грешка при записа на изходен файл"
@@ -1115,53 +1111,300 @@ msgstr "Грешка при записа на изходен файл"
msgid "Waiting for headers"
msgstr "Чакане на заглавни части"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Невалиден ред на заглавна част"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Неизвестен формат на дата"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Невалидни данни на заглавната част"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Неуспех при свързването"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Вътрешна грешка"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Коригиране на зависимостите..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " пропадна."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Неуспех при коригирането на зависимостите"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Неуспех при минимизирането на набора актуализации"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Готово"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
+"неизправности."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Неудовлетворени зависимости. Опитайте с „-f“."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Инсталиран]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Инсталиран]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Инсталиран]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Инсталиран]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "но е инсталиран %s"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "но ще бъде инсталиран %s"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "но той не може да бъде инсталиран"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "но той е виртуален пакет"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "но той не е инсталиран"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "но той няма да бъде инсталиран"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " или"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Следните пакети имат неудовлетворени зависимости:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Следните НОВИ пакети ще бъдат инсталирани:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Следните пакети няма да бъдат променени:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Следните пакети ще бъдат актуализирани:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Следните задържани пакети ще бъдат променени:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (поради %s) "
+
+#: apt-private/private-output.cc:696
+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"
+"Това НЕ би трябвало да става освен ако знаете точно какво правите!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu актуализирани, %lu нови инсталирани, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu преинсталирани, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu върнати към по-стара версия, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu за премахване и %lu без промяна.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu не са напълно инсталирани или премахнати.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Грешка при компилирането на регулярния израз - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Командата „update“ не възприема аргументи"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"Забележка: това е само симулация!\n"
+" apt-get има нужда от административни права за да работи.\n"
+" Заключването е деактивирано, така че не разчитайте\n"
+" на повтаряемост в реална ситуация."
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!"
@@ -1424,253 +1667,6 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Пакетът „%s“ не е инсталиран, така че не е премахнат\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Коригиране на зависимостите..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " пропадна."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Неуспех при коригирането на зависимостите"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Неуспех при минимизирането на набора актуализации"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Готово"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
-"неизправности."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Неудовлетворени зависимости. Опитайте с „-f“."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Инсталиран]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Инсталиран]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Инсталиран]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Инсталиран]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "но е инсталиран %s"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "но ще бъде инсталиран %s"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "но той не може да бъде инсталиран"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "но той е виртуален пакет"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "но той не е инсталиран"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "но той няма да бъде инсталиран"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " или"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Следните пакети имат неудовлетворени зависимости:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Следните НОВИ пакети ще бъдат инсталирани:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Следните пакети няма да бъдат променени:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Следните пакети ще бъдат актуализирани:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Следните задържани пакети ще бъдат променени:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (поради %s) "
-
-#: apt-private/private-output.cc:696
-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"
-"Това НЕ би трябвало да става освен ако знаете точно какво правите!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu актуализирани, %lu нови инсталирани, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu преинсталирани, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu върнати към по-стара версия, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu за премахване и %lu без промяна.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu не са напълно инсталирани или премахнати.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[y/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Грешка при компилирането на регулярния израз - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Командата „update“ не възприема аргументи"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"Забележка: това е само симулация!\n"
-" apt-get има нужда от административни права за да работи.\n"
-" Заключването е деактивирано, така че не разчитайте\n"
-" на повтаряемост в реална ситуация."
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1724,20 +1720,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Поп "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Поп:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Изт:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Изт:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Игн "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Игн:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Грш "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Грш:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1763,17 +1763,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Неуспех при четенето на %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1847,7 +1847,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Смесване на наличната информация"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1873,46 +1873,46 @@ msgstr ""
" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Неуспех при получаването на атрибути за %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Неуспех при записа на %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Списъкът с разширения на пакети и твърде дълъг"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Грешка при обработката на директория %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Списъкът с разширения на източници е твърде дълъг"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Грешка при запазването на заглавната част във файла със съдържание"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Грешка при обработката на съдържание %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1997,11 +1997,11 @@ msgstr ""
" -c=? Четене на този конфигурационен файл.\n"
" -o=? Настройване на произволна конфигурационна опция"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Няма съвпадения на избора"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Липсват някои файлове от групата с файлови пакети „%s“"
@@ -2113,22 +2113,22 @@ msgstr "Превишен лимит на DeLink от %sB.\n"
msgid "Archive had no package field"
msgstr "Архивът няма поле „package“"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s няма запис „override“\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " поддържащия пакета %s е %s, а не %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s няма запис „source override“\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s няма също и запис „binary override“\n"
@@ -2214,7 +2214,7 @@ msgstr "Неуспех при премахването на връзка на %s
msgid "Failed to rename %s to %s"
msgstr "Неуспех при преименуването на %s на %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2238,11 +2238,11 @@ msgstr ""
" -c=? Указване на файл с настройки\n"
" -o=? Указване на произволна настройка, напр. -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Непознат запис за пакет!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2315,6 +2315,26 @@ msgstr "Не е намерен oторизационен запис за: %s"
msgid "Hash mismatch for: %s"
msgstr "Несъответствие на контролната сума за: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Неуспех при намирането на драйвер за метод %s."
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Методът %s не стартира правилно"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2330,176 +2350,311 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "Списъкът с източници не можа да бъде прочетен."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Празен кеш на пакети"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Файлът за кеш на пакети е повреден"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Файлът за кеш на пакети е несъвместима версия"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr "Файлът за кеш на пакети е повреден, твърде малък е"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Тази версия на APT не поддържа система за версии „%s“"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Кешът на пакети е бил направен за различна архитектура"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Зависи от"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Предварително зависи от"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Предлага се"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Препоръчва се"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "В конфликт с"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Заменя"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Изважда от употреба"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Чупи"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Подобрява"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "важен"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "изискван"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "стандартен"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "незадължителен"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "допълнителен"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Изчисляване на актуализацията"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Неуспех при намирането на драйвер за метод %s."
+msgid "Index file type '%s' is not supported"
+msgstr "Не се поддържа индексен файл от типа „%s“"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Методът %s не стартира правилно"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Лошо форматиран ред %lu в списъка с източници %s (неразбираема [опция])"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+"Лошо форматиран ред %lu в списъка с източници %s (твърде кратка [опция])"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+"Лошо форматиран ред %lu в списъка с източници %s ([%s] не е присвояване)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (липсва ключ в [%s])"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Лошо форматиран ред %lu в списъка с източници %s ([%s] ключът %s няма "
+"стойност)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+"Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Отваряне на %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Ред %u в списъка с източници %s е твърде дълъг."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "Не се поддържа индексен файл от типа „%s“"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Изграждане на дървото със зависимости"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Неуспех при получаването на атрибути на %s."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Версии кандидати"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Кешът има несъвместима система за версии"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Генериране на зависимости"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Възникна грешка при обработката на %s (%s%d)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Четене на информацията за състоянието"
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT."
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте броя описания, на който е способна тази версия на APT."
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT."
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Неуспех при отварянето на StateFile %s"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Неуспех при запис на временен StateFile %s"
+msgid "Couldn't stat source package list %s"
+msgstr ""
+"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Четене на списъците с пакети"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Събиране на информация за „Осигурява“"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Изпращане на сценарий към програмата за удовлетворяване на зависимости"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Подготовка за приемане на решение"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Външната програма за удовлетворяване на зависимости се провали без да изведе "
+"съобщение за грешка"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "Изпълняване на външна програма за удовлетворяване на зависимости"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "преименуването се провали, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Несъответствие на контролната сума"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Несъответствие на размера"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Невалидна операция %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Грешка при запис"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
#, fuzzy
msgid "Does not start with a cleartext signature"
msgstr "Файлът %s не започва с информация за подписване в обикновен текст."
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2509,7 +2664,7 @@ msgstr ""
"използват старите индексни файлове. Грешка от GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "Грешка от GPG: %s: %s"
@@ -2525,14 +2680,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2541,16 +2696,16 @@ msgstr ""
"Не може да се открие елемент „%s“ във файла Release (объркан ред в sources."
"list или повреден файл)"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Не е открита контролна сума за „%s“ във файла Release"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2559,19 +2714,19 @@ msgstr ""
"Файлът със служебна информация за „%s“ е остарял (валиден до %s). Няма да се "
"прилагат обновявания от това хранилище."
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2580,129 +2735,54 @@ msgstr ""
"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
"ръчно да оправите този пакет (поради пропусната архитектура)."
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Не е открит източник, от който да се изтегли версия „%s“ на „%s“"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Кешът има несъвместима система за версии"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Възникна грешка при обработката на %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на "
-"APT."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT."
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Еха, надхвърлихте броя описания, на който е способна тази версия на APT."
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Четене на списъците с пакети"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Събиране на информация за „Осигурява“"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Блокът на производителя %s не съдържа отпечатък"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Директорията със списъци %spartial липсва."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Директорията за архиви %spartial липсва."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Не се поддържа индексен файл от типа „%s“"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "Неуспех при заключване на директорията %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Изтегляне на файл %li от %li (остават %s)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Изтегляне на файл %li от %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Някои индексни файлове не можаха да бъдат изтеглени. Те са пренебрегнати или "
-"са използвани по-стари."
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Неуспех при получаването на атрибути на %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2726,7 +2806,7 @@ msgstr "Неизвестен тип за отбиване %s"
msgid "No priority (or zero) specified for pin"
msgstr "Няма указан приоритет (или е нула) на отбиването"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2735,12 +2815,12 @@ msgstr ""
"Неуспех при незабавната настройка на „%s“. За повече информация вижте "
"информацията за APT::Immediate-Configure в „man 5 apt.conf“. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr "Неуспех при конфигуриране на „%s“. "
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2752,10 +2832,13 @@ msgstr ""
"пакет %s. Това често е лошо, но ако наистина искате да го направите, "
"активирайте опцията APT::Force-LoopBreak."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Ред %u в списъка с източници %s е твърде дълъг."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Някои индексни файлове не можаха да бъдат изтеглени. Те са пренебрегнати или "
+"са използвани по-стари."
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2826,11 +2909,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Копиране на списъците с пакети..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Запазване на новия списък с източници\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Записите в списъка с източници за този диск са:\n"
@@ -2842,7 +2925,7 @@ msgstr ""
"Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за "
"него."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2850,149 +2933,41 @@ msgstr ""
"Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е "
"причинено от задържани пакети."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Неуспех при коригирането на проблемите, имате задържани счупени пакети."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "Изпращане на сценарий към програмата за удовлетворяване на зависимости"
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr "Изпращане на заявка към програмата за удовлетворяване на зависимости"
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr "Подготовка за приемане на решение"
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Външната програма за удовлетворяване на зависимости се провали без да изведе "
-"съобщение за грешка"
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr "Изпълняване на външна програма за удовлетворяване на зависимости"
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Неуспех при анализирането на пакетен файл %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Неуспех при анализирането на пакетен файл %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Неуспех при анализиране на файл Release %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Във файла Release %s липсват раздели"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Във файла Release %s липсва контролна сума"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Неправилна стойност за „Valid-Until“ във файла Release %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Неправилна стойност за „Date“ във файла Release %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s (неразбираема [опция])"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s (твърде кратка [опция])"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s ([%s] не е присвояване)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Лошо форматиран ред %lu в списъка с източници %s (липсва ключ в [%s])"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s ([%s] ключът %s няма "
-"стойност)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Изграждане на дървото със зависимости"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Версии кандидати"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Генериране на зависимости"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Четене на информацията за състоянието"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "Отваряне на %s"
+msgid "Failed to open StateFile %s"
+msgstr "Неуспех при отварянето на StateFile %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Неуспех при запис на временен StateFile %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
-
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
+msgid "Unable to parse package file %s (%d)"
+msgstr "Неуспех при анализирането на пакетен файл %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -3004,48 +2979,48 @@ msgstr "Не е намерено издание „%s“ на „%s“"
msgid "Version '%s' for '%s' was not found"
msgstr "Не е намерена версия „%s“ на „%s“"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Неуспех при намиране на задача „%s“"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Не е възможно избиране на версия за пакета „%s“ понеже е виртуален"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Не е възможно избиране на на последната версия за пакета „%s“, защото е "
"виртуален"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Не е възможно избиране на кандидат-версия за пакета „%s“, защото няма "
"подходящ кандидати"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Не е възможно избиране на инсталирана версия на пакета „%s“, защото не е "
"инсталиран"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3054,184 +3029,59 @@ msgstr ""
"Не е възможно избиране на инсталирана или кандидат версия за пакета „%s“ "
"понеже той няма нито едната"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Инсталиране на %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Конфигуриране на %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Премахване на %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "Окончателно премахване на %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Отбелязване на изчезването на %s"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Изпълнение на тригер след инсталиране %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Директорията „%s“ липсва"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Неуспех при отваряне на файла „%s“"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Подготвяне на %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Unpacking %s"
-msgstr "Разпакетиране на %s"
+msgid "Unable to parse Release file %s"
+msgstr "Неуспех при анализиране на файл Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Preparing to configure %s"
-msgstr "Подготвяне на %s за конфигуриране"
+msgid "No sections in Release file %s"
+msgstr "Във файла Release %s липсват раздели"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Installed %s"
-msgstr "%s е инсталиран"
+msgid "No Hash entry in Release file %s"
+msgstr "Във файла Release %s липсва контролна сума"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Подготвяне за премахване на %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Неправилна стойност за „Valid-Until“ във файла Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Removed %s"
-msgstr "%s е премахнат"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Неправилна стойност за „Date“ във файла Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Подготовка за пълно премахване на %s"
+msgid "%lid %lih %limin %lis"
+msgstr "%liд %liч %liм %liс"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Completely removed %s"
-msgstr "%s е напълно премахнат"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Неуспех при записа на %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr "Операцията е прекъсната"
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-"Поради достигане на максималния брой доклади (MaxReports) не е записан нов "
-"доклад за зависимостите."
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "отлагане на настройката поради неудовлетворени зависимости"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Доклад за зависимостите не е записан защото съобщението за грешка е породено "
-"от друга грешка."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Доклад за зависимостите не е записан защото грешката е причинена от "
-"недостатъчно дисково пространство"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Доклад за зависимостите не е записан защото грешката е причинена от "
-"недостатъчна оперативна памет"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Доклад за зависимостите не е записан защото грешката е причинена от "
-"недостатъчно дисково пространство"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Доклад за зависимостите не е записан поради входно-изходна грешка с dpkg"
+msgid "%lih %limin %lis"
+msgstr "%liч %liм %liс"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Неуспех при заключване на административната директория (%s). Може би се "
-"използва от друг процес?"
+msgid "%limin %lis"
+msgstr "%liм %liс"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Неуспех при заключване на административната директория (%s). Може би липсват "
-"административни права?"
+msgid "%lis"
+msgstr "%liс"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"Процесът dpkg е беше прекъснат. Проблемът трябва да се коригира чрез ръчно "
-"изпълнение на „%s“."
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Без заключване"
+msgid "Selection %s not found"
+msgstr "Изборът %s не е намерен"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3370,35 +3220,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Готово"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%liд %liч %liм %liс"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liч %liм %liс"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%liм %liс"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%liс"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Изборът %s не е намерен"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Невъзможно е да се прехвърли в паметта празен файл"
@@ -3464,110 +3285,284 @@ msgstr "Неуспех при намирането на атрибутите н
msgid "Failed to stat the cdrom"
msgstr "Неуспех при намирането на атрибутите на cdrom"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Неизвестен тип на абревиатура: „%c“"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Отваряне на конфигурационен файл %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Синтактична грешка %s:%u: В началото на блока няма име."
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Синтактична грешка %s:%u: Лошо форматиран таг"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Синтактична грешка %s:%u: Излишни символи след стойността"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Синтактична грешка %s:%u: Директиви могат да се задават само в най-горното "
"ниво"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Синтактична грешка %s:%u: директивата clear изисква аргумент дърво от опции"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Неизвестна опция за команден ред „%c“ [от %s]."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Опцията за команден ред %s не е разпозната"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Опцията за команден ред %s не е булева"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Опция %s изисква аргумент."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Опция %s: Значението трябва да има =<val>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "Опция %s изисква аргумент цяло число, не „%s“"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Опция „%s“ е твърде дълга"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "Смисълът %s не е ясен, опитайте true или false."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Невалидна операция %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Инсталиране на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Конфигуриране на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Премахване на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "Окончателно премахване на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Отбелязване на изчезването на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Изпълнение на тригер след инсталиране %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Директорията „%s“ липсва"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Неуспех при отваряне на файла „%s“"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Подготвяне на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Разпакетиране на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Подготвяне на %s за конфигуриране"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "%s е инсталиран"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Подготвяне за премахване на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "%s е премахнат"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Подготовка за пълно премахване на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s е напълно премахнат"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Неуспех при записа на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "Операцията е прекъсната"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+"Поради достигане на максималния брой доклади (MaxReports) не е записан нов "
+"доклад за зависимостите."
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "отлагане на настройката поради неудовлетворени зависимости"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Доклад за зависимостите не е записан защото съобщението за грешка е породено "
+"от друга грешка."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Доклад за зависимостите не е записан защото грешката е причинена от "
+"недостатъчно дисково пространство"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Доклад за зависимостите не е записан защото грешката е причинена от "
+"недостатъчна оперативна памет"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Доклад за зависимостите не е записан защото грешката е причинена от "
+"недостатъчно дисково пространство"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Доклад за зависимостите не е записан поради входно-изходна грешка с dpkg"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Неуспех при заключване на административната директория (%s). Може би се "
+"използва от друг процес?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+"Неуспех при заключване на административната директория (%s). Може би липсват "
+"административни права?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"Процесът dpkg е беше прекъснат. Проблемът трябва да се коригира чрез ръчно "
+"изпълнение на „%s“."
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Без заключване"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "Извикан е DropNode за все още използван възел"
@@ -3672,7 +3667,7 @@ msgstr "Това не е валиден DEB архив, липсва елеме
msgid "Internal error, could not locate member %s"
msgstr "Вътрешна грешка, неуспех при намирането на съставна част %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Контролен файл, невъзможен за анализ"
@@ -3701,23 +3696,23 @@ msgstr "Архивът е твърде кратък"
msgid "Failed to read the archive headers"
msgstr "Неуспех при четенето на заглавните части на архива"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Неуспех при създаването на програмни канали"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Неуспех при изпълнението на gzip"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Развален архив"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Невярна контролна сума на tar, развален архив"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Непозната заглавна част на TAR тип %u, елемент %s"
diff --git a/po/bs.po b/po/bs.po
index 807af53cd..abb9a570a 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2004-05-06 15:25+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -22,147 +22,147 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Paket %s verzije %s ima nezadovoljenu zavisnost:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Ukupno naziva paketa:"
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid "Total package structures: "
msgstr "Ukupno naziva paketa:"
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Normalni paketi:"
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Čisto virtuelni paketi:"
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Pojedinačni virutuelni paketi:"
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Miješani virtuelni paketi:"
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Nedostajući:"
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Ukupno različitih verzija:"
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
#, fuzzy
msgid "Total distinct descriptions: "
msgstr "Ukupno različitih verzija:"
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Ukupno zavisnosti:"
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Ukupno Verzija/Datoteka odnosa:"
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
#, fuzzy
msgid "Total Desc/File relations: "
msgstr "Ukupno Verzija/Datoteka odnosa:"
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr ""
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr ""
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr ""
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr ""
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Paketi nisu pronađeni"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr ""
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Ne mogu pronaći paket %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Datoteke paketa:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr ""
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr ""
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Instalirano:"
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr ""
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr ""
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr ""
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr ""
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -199,20 +199,20 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr ""
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Ne mogu otvoriti %s"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -220,7 +220,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
@@ -256,83 +256,78 @@ msgstr ""
" -c=? Pročitaj ovu konfiguracijsku datoteku\n"
" -o=? Podesi odgovarajuću konfiguracijsku opciju, npr. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, c-format
msgid "Can not find a package for architecture '%s'"
msgstr ""
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr ""
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr ""
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ali se %s treba instalirati"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "ali se %s treba instalirati"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Ne mogu kreirati %s"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -340,137 +335,137 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr ""
@@ -537,11 +532,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr ""
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -555,52 +550,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "ali nije instaliran"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "ali se %s treba instalirati"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "ali se %s treba instalirati"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr ""
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr ""
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "ali se %s treba instalirati"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "Ne mogu otvoriti %s"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -820,7 +816,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr ""
@@ -909,37 +905,37 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr "Ne mogu se povezati sa %s %s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr ""
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Slijedeći dodatni paketi će biti instalirani:"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -949,31 +945,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr ""
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr ""
@@ -981,53 +977,293 @@ msgstr ""
msgid "Waiting for headers"
msgstr "Čekam na zaglavlja"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr ""
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Nepoznat oblik datuma"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr ""
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Povezivanje neuspješno"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Unutrašnja greška"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Ispravljam zavisnosti..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Ne mogu ispraviti zavisnosti"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Urađeno"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr "[Instalirano]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "ali je %s instaliran"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ali se %s treba instalirati"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "ali se ne može instalirati"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "ali je virtuelni paket"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "ali nije instaliran"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "ali se neće instalirati"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " ili"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Slijedeći NOVI paketi će biti instalirani:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Slijedeći paketi će biti UKLONJENI:"
+
+#: apt-private/private-output.cc:571
+#, fuzzy
+msgid "The following packages have been kept back:"
+msgstr "Slijedeći paketi su zadržani:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Slijedeći paketi će biti nadograđeni:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr ""
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr ""
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr ""
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr ""
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr ""
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr ""
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr ""
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr ""
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1265,246 +1501,6 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr ""
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Ispravljam zavisnosti..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Ne mogu ispraviti zavisnosti"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Urađeno"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr "[Instalirano]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "ali je %s instaliran"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ali se %s treba instalirati"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "ali se ne može instalirati"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "ali je virtuelni paket"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "ali nije instaliran"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "ali se neće instalirati"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " ili"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Slijedeći NOVI paketi će biti instalirani:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Slijedeći paketi će biti UKLONJENI:"
-
-#: apt-private/private-output.cc:571
-#, fuzzy
-msgid "The following packages have been kept back:"
-msgstr "Slijedeći paketi su zadržani:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Slijedeći paketi će biti nadograđeni:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr ""
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr ""
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr ""
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr ""
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr ""
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr ""
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr ""
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1559,19 +1555,19 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
+msgid "Hit:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:88
-msgid "Get:"
+msgid "Get:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:119
-msgid "Ign "
+msgid "Ign:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:126
-msgid "Err "
+msgid "Err:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:150
@@ -1595,17 +1591,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Ne mogu čitati %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1677,7 +1673,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Sastavljam dostupne informacije"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1691,47 +1687,47 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Ne mogu kreirati %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Ne mogu zapisati na %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
"Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1773,11 +1769,11 @@ msgid ""
" -o=? Set an arbitrary configuration option"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr ""
@@ -1887,22 +1883,22 @@ msgstr ""
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -1988,7 +1984,7 @@ msgstr ""
msgid "Failed to rename %s to %s"
msgstr ""
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2002,11 +1998,11 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Nepoznat zapis paketa\""
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2068,6 +2064,26 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr ""
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2080,176 +2096,296 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr ""
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr ""
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr ""
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr ""
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr ""
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr ""
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr ""
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Zavisi"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Unaprijed zavisi"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Predlaže"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Preporučuje"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
#, fuzzy
msgid "Conflicts"
msgstr "Sukobljava se sa"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Zamjenjuje"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Zastarijeva"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "važno"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "zahtijevano"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "standardno"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "opcionalno"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "extra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Računam nadogradnju"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
+msgid "Index file type '%s' is not supported"
msgstr ""
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, c-format
-msgid "Is the package %s installed?"
+msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Gradim stablo zavisnosti"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Verzije kandidata"
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Stvaranje zavisnosti"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "Sastavljam dostupne informacije"
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr ""
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Ne mogu otvoriti %s"
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr ""
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Ne mogu ukloniti %s"
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Otvaram %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr ""
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr ""
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:591
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Čitam spiskove paketa"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
msgid "Invalid file format"
msgstr ""
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Greška pri pisanju"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2257,7 +2393,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
@@ -2273,170 +2409,102 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ne mogu otvoriti DB datoteku %s"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, 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:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr ""
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Čitam spiskove paketa"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr ""
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, c-format
-msgid "Clean of %s is not supported"
-msgstr ""
+#: apt-pkg/acquire.cc:162
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Ne mogu kreirati %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Čitam spisak datoteke"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2458,19 +2526,19 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "Ne mogu otvoriti %s"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2478,9 +2546,10 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
msgstr ""
#: apt-pkg/cdrom.cc:571
@@ -2549,11 +2618,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Čitam spiskove paketa"
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr ""
@@ -2563,144 +2632,46 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Gradim stablo zavisnosti"
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Verzije kandidata"
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Stvaranje zavisnosti"
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr ""
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Sastavljam dostupne informacije"
-#: apt-pkg/indexrecords.cc:83
+#: apt-pkg/depcache.cc:252
#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+msgid "Failed to open StateFile %s"
+msgstr "Ne mogu otvoriti %s"
-#: apt-pkg/indexrecords.cc:171
+#: apt-pkg/depcache.cc:258
#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ne mogu otvoriti DB datoteku %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Otvaram %s"
-
-#: apt-pkg/sourcelist.cc:371
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:375
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ne mogu ukloniti %s"
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid "Unable to parse package file %s (%d)"
msgstr ""
#: apt-pkg/cacheset.cc:501
@@ -2713,207 +2684,100 @@ msgstr ""
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Ne mogu otvoriti %s"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr ""
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Ne mogu otvoriti %s"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr " Instalirano:"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, fuzzy, c-format
-msgid "Configuring %s"
-msgstr "Povezujem se sa %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, fuzzy, c-format
-msgid "Removing %s"
-msgstr "Otvaram %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/indexrecords.cc:83
#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Ne mogu ukloniti %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "Unable to parse Release file %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
-#: apt-pkg/deb/dpkgpm.cc:112
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Running post-installation trigger %s"
+msgid "No sections in Release file %s"
msgstr ""
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Directory '%s' missing"
+msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Ne mogu otvoriti %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, fuzzy, c-format
-msgid "Preparing %s"
-msgstr "Otvaram %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, fuzzy, c-format
-msgid "Unpacking %s"
-msgstr "Otvaram %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing to configure %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:164
#, fuzzy, c-format
-msgid "Installed %s"
-msgstr " Instalirano:"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing for removal of %s"
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, fuzzy, c-format
-msgid "Removed %s"
-msgstr "Preporučuje"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1025
-#, fuzzy, c-format
-msgid "Completely removed %s"
-msgstr "Ne mogu ukloniti %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Ne mogu zapisati na %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
+msgid "%lis"
msgstr ""
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
+msgid "Selection %s not found"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:196
@@ -3049,35 +2913,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr ""
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr ""
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr ""
@@ -3140,107 +2975,263 @@ msgstr ""
msgid "Failed to stat the cdrom"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:112
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr " Instalirano:"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, fuzzy, c-format
+msgid "Configuring %s"
+msgstr "Povezujem se sa %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Otvaram %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Ne mogu ukloniti %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Ne mogu otvoriti %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, fuzzy, c-format
+msgid "Preparing %s"
+msgstr "Otvaram %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "Otvaram %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr " Instalirano:"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, fuzzy, c-format
+msgid "Removed %s"
+msgstr "Preporučuje"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Ne mogu ukloniti %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Ne mogu zapisati na %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr ""
@@ -3345,7 +3336,7 @@ msgstr ""
msgid "Internal error, could not locate member %s"
msgstr ""
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr ""
@@ -3374,23 +3365,23 @@ msgstr "Arhiva je prekratka"
msgid "Failed to read the archive headers"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Ne mogu izvršiti gzip"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Oštećena arhiva"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 375fac71e..065ad0ea7 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.6\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2012-10-19 13:30+0200\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -23,146 +23,146 @@ msgstr ""
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:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Nombre total de paquets: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Nombre total d'estructures de paquets: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Paquets normals: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Paquets virtuals purs: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Paquets virtuals únics: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Paquets virtuals mixtes: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Falten: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Nombre total de versions diferents: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Nombre total de descripcions diferents: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Nombre total de dependències: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Nombre total de relacions versió/fitxer: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Nombre total de relacions descripció/fitxer: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Nombre total dels mapes aportats: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Nombre total de cadenes globals: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Nombre total de l'espai desaprofitat: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Nombre total de l'espai atribuït a: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "El fitxer %s del paquet està desincronitzat."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "No s'han trobat paquets"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Heu de donar com a mínim un patró de cerca"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
"Aquesta ordre és desaconsellada. Empreu «apt-mark showauto» en el seu lloc."
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "No s'ha trobat el paquet %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Fitxers de paquets:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
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"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Paquets etiquetats:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(no trobat)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Instaŀlat: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Candidat: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(cap)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Etiqueta del paquet: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Taula de versió:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
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:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -236,20 +236,20 @@ msgstr ""
"Vegeu les pàgines de manual apt-cache(8) i apt.conf(5) per a més "
"informació.\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Doneu un nom per a aquest disc, com per exemple «Debian 5.0.3 Disc 1»"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Inseriu un disc en la unitat i premeu Intro"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "No s'ha pogut muntar «%s» a «%s»"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -257,7 +257,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Repetiu aquest procés per a la resta de CD del vostre joc."
@@ -293,48 +293,48 @@ msgstr ""
" -c=? Llegeix aquest fitxer de configuració\n"
" -o=? Estableix una opció de conf arbitrària, p. ex. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "S'està agafant «%s» com a paquet font en lloc de '%s'\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Descarta la versió «%s» no disponible del paquet «%s»"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "No s'ha pogut trobar el paquet %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "S'ha marcat %s com instaŀlat manualment.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "S'ha marcat %s com instaŀlat automàticament.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -342,30 +342,25 @@ msgstr ""
"Aquesta ordre és desaconsellada. Empreu «apt-mark auto» i «apt-mark manual» "
"en el seu lloc."
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
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:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "No es pot blocar el directori %s"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "No és possible blocar el directori de descàrrega"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "Haureu d'especificar un paquet de codi font per a baixar"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, 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:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -375,7 +370,7 @@ msgstr ""
"versions «%s» a:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -387,70 +382,70 @@ msgstr ""
"per obtenir les últimes actualitzacions (possiblement no publicades) del "
"paquet.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "S'està ometent el fitxer ja baixat «%s»\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es necessita baixar %sB/%sB d'arxius font.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es necessita baixar %sB d'arxius font.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Obtén el font %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "No s'ha pogut baixar alguns arxius."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Baixada completa i en mode de només baixada"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, 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:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "L'ordre de construir «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Ha fallat el procés fill"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
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:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -459,28 +454,28 @@ msgstr ""
"No hi ha informació d'arquitectura disponible per a %s. Vegeu apt.conf(5) "
"APT::Architectures per a configurar-ho"
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "No es poden processar les dependències de construcció"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, 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:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no té dependències de construcció.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -489,7 +484,7 @@ msgstr ""
"La dependència %s en %s no es pot satisfer perquè %s no és permès als "
"paquets «%s»"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -498,14 +493,14 @@ msgstr ""
"La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet "
"%s"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, 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 instaŀlat %s és "
"massa nou"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -514,7 +509,7 @@ msgstr ""
"La dependència %s per a %s no es pot satisfer perquè la versió candidata del "
"paquet %s no pot satisfer els requeriments de versions"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -523,17 +518,17 @@ msgstr ""
"La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió "
"candidata"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, 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:1412
+#: cmdline/apt-get.cc:1403
#, 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:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "No es poden processar les dependències de construcció"
@@ -647,11 +642,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Haureu d'especificar un paquet de codi font per a baixar"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -665,52 +660,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "%s no es pot marcar perquè no està instaŀlat.\n"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s ja estava marcat com instaŀlat manualment.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s ja estava marcat com instaŀlat automàticament.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr "%s ja estava retingut.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr "%s ja estava no retingut.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperava %s però no hi era"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr "S'ha marcat %s com retingut.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "S'ha cancel·lat la marca de retenció en %s.\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr "L'execució del dpkg ha fallat. Sou root?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -932,7 +928,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:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Problema escollint el fitxer"
@@ -1021,40 +1017,40 @@ msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "No es pot connectar amb %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
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:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "S'ha trobat almenys una signatura invàlida."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"No s'ha pogut executar el «apt-key» per a verificar la signatura (està "
"instaŀlat el gnupg?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "S'ha produït un error desconegut en executar el apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Les signatures següents són invàlides:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1066,32 +1062,32 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr "Els fitxers buits no poden ser arxius vàlids"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "S'ha produït un error en escriure al fitxer"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"S'ha produït un error en llegir, el servidor remot ha tancat la connexió"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "S'ha produït un error en llegir des del servidor"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "S'ha produït un error en escriure al fitxer"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Ha fallat la selecció"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Connexió finalitzada"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "S'ha produït un error en escriure al fitxer de sortida"
@@ -1099,53 +1095,298 @@ msgstr "S'ha produït un error en escriure al fitxer de sortida"
msgid "Waiting for headers"
msgstr "S'estan esperant les capçaleres"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Línia de capçalera incorrecta"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "El servidor HTTP ha enviat una capçalera de resposta no vàlida"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "El servidor HTTP ha enviat una capçalera de Content-Length no vàlida"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "El servidor HTTP ha enviat una capçalera de Content-Range no vàlida"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Aquest servidor HTTP té el suport d'abast trencat"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Format de la data desconegut"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Capçalera de dades no vàlida"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Ha fallat la connexió"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Error intern"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "S'estan corregint les dependències…"
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " ha fallat."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "No es poden corregir les dependències"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "No es pot minimitzar el joc de versions revisades"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Fet"
+
+#: apt-private/private-cachefile.cc:110
+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."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependències sense satisfer. Proveu-ho emprant -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instaŀlat]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instaŀlat]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instaŀlat]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instaŀlat]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "però està instaŀlat %s"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "però s'instaŀlarà %s"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "però no és instaŀlable"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "però és un paquet virtual"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "però no està instaŀlat"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "però no serà instaŀlat"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " o"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Els següents paquets tenen dependències sense satisfer:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "S'instaŀlaran els paquets NOUS següents:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Es SUPRIMIRAN els paquets següents:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "S'han mantingut els paquets següents:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "S'actualitzaran els paquets següents:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Es DESACTUALITZARAN els paquets següents:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Es canviaran els paquets retinguts següents:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (per %s) "
+
+#: apt-private/private-output.cc:696
+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: Es suprimiran els paquets essencials següents.\n"
+"Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu actualitzats, %lu nous a instaŀlar, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstaŀlats, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu desactualitzats, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu a suprimir i %lu no actualitzats.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu no instaŀlats o suprimits completament.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "L'ordre update no pren arguments"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"Nota: Això només és una simulació!\n"
+" L'apt-get necessita privilegis de root per a l'execució real.\n"
+" Tingueu en ment que el bloqueig està desactivat,\n"
+" per tant, no es depèn de la situació actual real."
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1414,251 +1655,6 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr "El paquet «%s» no està instaŀlat, així doncs no es suprimirà\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "S'estan corregint les dependències…"
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " ha fallat."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "No es poden corregir les dependències"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "No es pot minimitzar el joc de versions revisades"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Fet"
-
-#: apt-private/private-cachefile.cc:110
-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."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependències sense satisfer. Proveu-ho emprant -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instaŀlat]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instaŀlat]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instaŀlat]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instaŀlat]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "però està instaŀlat %s"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "però s'instaŀlarà %s"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "però no és instaŀlable"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "però és un paquet virtual"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "però no està instaŀlat"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "però no serà instaŀlat"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " o"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Els següents paquets tenen dependències sense satisfer:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "S'instaŀlaran els paquets NOUS següents:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Es SUPRIMIRAN els paquets següents:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "S'han mantingut els paquets següents:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "S'actualitzaran els paquets següents:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Es DESACTUALITZARAN els paquets següents:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Es canviaran els paquets retinguts següents:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (per %s) "
-
-#: apt-private/private-output.cc:696
-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: Es suprimiran els paquets essencials següents.\n"
-"Això NO s'ha de fer a menys que sapigueu exactament el que esteu fent!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu actualitzats, %lu nous a instaŀlar, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstaŀlats, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu desactualitzats, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu a suprimir i %lu no actualitzats.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu no instaŀlats o suprimits completament.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "L'ordre update no pren arguments"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"Nota: Això només és una simulació!\n"
-" L'apt-get necessita privilegis de root per a l'execució real.\n"
-" Tingueu en ment que el bloqueig està desactivat,\n"
-" per tant, no es depèn de la situació actual real."
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1712,20 +1708,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Obj "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Obj:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Bai:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Bai:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1751,17 +1751,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "No es pot llegir %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1838,7 +1838,7 @@ msgstr ""
msgid "Merging available information"
msgstr "S'està fusionant la informació disponible"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1862,46 +1862,46 @@ 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:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "No es pot veure l'estat de %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "No es pot escriure en %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "No es pot determinar la versió de debconf. Està instaŀlat debconf?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "La llista de les extensions dels paquets és massa llarga"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "S'ha produït un error en processar el directori %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "La llista d'extensions de les fonts és massa llarga"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
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:431
+#: ftparchive/apt-ftparchive.cc:430
#, 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:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1982,11 +1982,11 @@ msgstr ""
" -c=? Llegeix aquest fitxer de configuració\n"
" -o=? Estableix una opció de configuració arbitrària"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "No s'ha trobat cap selecció"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, 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'"
@@ -2098,22 +2098,22 @@ msgstr " DeLink s'ha arribat al límit de %sB.\n"
msgid "Archive had no package field"
msgstr "Arxiu sense el camp paquet"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s no té una entrada dominant\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el mantenidor de %s és %s, no %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s no té una entrada dominant de font\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s no té una entrada dominant de binari\n"
@@ -2199,7 +2199,7 @@ msgstr "S'ha trobat un problema treient l'enllaç %s"
msgid "Failed to rename %s to %s"
msgstr "No s'ha pogut canviar el nom de %s a %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2224,11 +2224,11 @@ 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-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Registre del paquet desconegut!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2302,6 +2302,26 @@ msgstr "No s'ha pogut trobar el registre d'autenticatió per a: %s"
msgid "Hash mismatch for: %s"
msgstr "El resum no coincideix per a: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, 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:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "El mètode %s no s'ha iniciat correctament"
+
+#: apt-pkg/acquire-worker.cc:485
+#, 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/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2316,176 +2336,307 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "No s'ha pogut llegir la llista de les fonts."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Memòria cau de paquets és buida"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "El fitxer de memòria cau de paquets està corromput"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
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:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr "El fitxer de memòria cau de paquets està corromput, és massa petit"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Aquest APT no suporta el sistema de versions «%s»"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "La memòria cau de paquets fou creada per a una arquitectura diferent"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Depèn"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Predepèn"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Suggereix"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Recomana"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Entra en conflicte"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Reemplaça"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Fa obsolet"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Trenca"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Millora"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "important"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "requerit"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "estàndard"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "opcional"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "extra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "S'està calculant l'actualització"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "No s'ha pogut trobar el mètode de control %s."
+msgid "Index file type '%s' is not supported"
+msgstr "El tipus de fitxer índex «%s» no està suportat"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El mètode %s no s'ha iniciat correctament"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Línia %lu malformada en la llista de fonts %s ([opció] no reconeixible)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, 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."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Línia %lu malformada en la llista de fonts %s ([opció] massa curta)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+"Línia %lu malformada en la llista de fonts %s ([%s] no és una assignació)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Línia %lu malformada en la llista de fonts %s ([%s] no té clau)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Línia %lu malformada en la llista de fonts %s ([%s] la clau %s no té valor)"
+
+#: apt-pkg/sourcelist.cc:206
+#, 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:208
+#, 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:211
+#, 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:217
+#, 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:224
+#, 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:335
+#, c-format
+msgid "Opening %s"
+msgstr "S'està obrint %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, 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:371
+#, 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:375
+#, 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:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %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/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "El tipus de fitxer índex «%s» no està suportat"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "S'està construint l'arbre de dependències"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "No es pot veure l'estat de %s."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versions candidates"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "La memòria cau té un sistema de versions incompatible"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Dependències que genera"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "S'ha produït un error en processar %s (%s%d)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "S'està llegint la informació de l'estat"
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Uau, heu excedit el nombre de paquets que aquest APT és capaç de gestionar."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"Uau, heu excedit el nombre de versions que aquest APT és capaç de gestionar."
+
+#: apt-pkg/pkgcachegen.cc:279
+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:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Uau, heu excedit el nombre de dependències que aquest APT és capaç de "
+"gestionar."
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "No s'ha pogut obrir el fitxer d'estat %s"
+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/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
+msgid "Couldn't stat source package list %s"
+msgstr "No s'ha pogut llegir la llista de paquets font %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "S'està llegint la llista de paquets"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "S'estan recollint els fitxers que proveeixen"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Error d'E/S en desar la memòria cau de la font"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Envia l'escenari al resoledor"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Envia la petició al resoledor"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Prepara per a rebre una solució"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "El resoledor extern ha fallat sense un missatge d'error adient"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "Executa un resoledor extern"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "La suma resum no concorda"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "La mida no concorda"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Operació no vàlida %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Error d'escriptura"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
#, fuzzy
msgid "Does not start with a cleartext signature"
msgstr "El fitxer %s no comença amb un missatge signat en clar"
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2496,7 +2647,7 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "S'ha produït un error amb el GPG: %s: %s"
@@ -2512,14 +2663,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2528,16 +2679,16 @@ msgstr ""
"No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada errònia "
"al sources.list o fitxer malformat)"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "No s'ha trobat la suma de comprovació per a «%s» al fitxer Release"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
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:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2546,19 +2697,19 @@ msgstr ""
"El fitxer Release per a %s ha caducat (invàlid des de %s). Les "
"actualitzacions per a aquest dipòsit no s'aplicaran."
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2568,12 +2719,12 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "No es troba una font per baixar la versió «%s» de «%s»"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2581,119 +2732,42 @@ msgstr ""
"L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
"per al paquet %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "La memòria cau té un sistema de versions incompatible"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "S'ha produït un error en processar %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Uau, heu excedit el nombre de paquets que aquest APT és capaç de gestionar."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Uau, heu excedit el nombre de versions que aquest APT és capaç de gestionar."
-
-#: apt-pkg/pkgcachegen.cc:279
-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:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Uau, heu excedit el nombre de dependències que aquest APT és capaç de "
-"gestionar."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, 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:1203
-#, 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:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "S'està llegint la llista de paquets"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "S'estan recollint els fitxers que proveeixen"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Error d'E/S en desar la memòria cau de la font"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "El camp del proveïdor %s no té una empremta digital"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Falta el directori de llistes %spartial."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Falta el directori d'arxius %spartial."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "El tipus de fitxer índex «%s» no està suportat"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "No es pot blocar el directori %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, 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:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "S'està obtenint el fitxer %li de %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Alguns índex no s'han pogut baixar. S'han descartat, o en el seu lloc s'han "
-"emprat els antics."
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
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/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "No es pot veure l'estat de %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2717,7 +2791,7 @@ msgstr "No s'ha entès el pin de tipus %s"
msgid "No priority (or zero) specified for pin"
msgstr "No hi ha prioritat especificada per al pin (o és zero)"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2726,12 +2800,12 @@ msgstr ""
"No s'ha pogut realitzar la configuració immediata de «%s». Vegeu man 5 apt."
"conf, sota APT::Immediate-Configure per a més detalls. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr "No s'ha pogut configurar «%s»."
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2743,10 +2817,13 @@ msgstr ""
"dolenta, però si realment desitgeu fer-la, activeu l'opció APT::Force-"
"LoopBreak."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, 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/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Alguns índex no s'han pogut baixar. S'han descartat, o en el seu lloc s'han "
+"emprat els antics."
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2817,11 +2894,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "S'estan copiant les llistes de paquets…"
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "S'està escrivint una nova llista de fonts\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Les entrades de la llista de fonts per a aquest disc són:\n"
@@ -2832,7 +2909,7 @@ msgid ""
msgstr ""
"El paquet %s necessita ser reinstaŀlat, però no se li pot trobar un arxiu."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2840,144 +2917,42 @@ msgstr ""
"Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat "
"causat per paquets retinguts."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"No es poden corregir els problemes, teniu paquets retinguts que estan "
"trencats."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "Envia l'escenari al resoledor"
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr "Envia la petició al resoledor"
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr "Prepara per a rebre una solució"
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr "El resoledor extern ha fallat sense un missatge d'error adient"
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr "Executa un resoledor extern"
-
-#: apt-pkg/tagfile.cc:169
-#, 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:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "No es pot analitzar el fitxer del paquet %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "No es pot analitzar el fitxer Release %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "No hi ha seccions al fitxer Release %s"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "No hi ha una entrada Hash al fitxer Release %s"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "El camp «Valid-Until» al fitxer Release %s és invàlid"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "El camp «Date» al fitxer Release %s és invàlid"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Línia %lu malformada en la llista de fonts %s ([opció] no reconeixible)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Línia %lu malformada en la llista de fonts %s ([opció] massa curta)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Línia %lu malformada en la llista de fonts %s ([%s] no és una assignació)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Línia %lu malformada en la llista de fonts %s ([%s] no té clau)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Línia %lu malformada en la llista de fonts %s ([%s] la clau %s no té valor)"
-
-#: apt-pkg/sourcelist.cc:206
-#, 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:208
-#, 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "S'està construint l'arbre de dependències"
-#: apt-pkg/sourcelist.cc:211
-#, 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/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versions candidates"
-#: apt-pkg/sourcelist.cc:217
-#, 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/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Dependències que genera"
-#: apt-pkg/sourcelist.cc:224
-#, 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/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "S'està llegint la informació de l'estat"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "S'està obrint %s"
+msgid "Failed to open StateFile %s"
+msgstr "No s'ha pogut obrir el fitxer d'estat %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, 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)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, 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:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "No es pot analitzar el fitxer del paquet %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2989,50 +2964,50 @@ msgstr "No s'ha trobat la versió puntual «%s» per a «%s»"
msgid "Version '%s' for '%s' was not found"
msgstr "No s'ha trobat la versió «%s» per a «%s»"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "No s'ha pogut trobar la tasca «%s»"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"No s'han pogut seleccionar les versions del paquet «%s» ja que és purament "
"virtual"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"No s'ha pogut seleccionar la versió més nova del paquet «%s» ja que és "
"purament virtual"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"No s'ha pogut seleccionar la versió candidata del paquet %s ja que no té "
"candidata"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"No s'ha pogut seleccionar la versió instaŀlada del paquet %s ja que no està "
"instaŀlada"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3041,181 +3016,59 @@ msgstr ""
"No s'han pogut seleccionar la versió instaŀlada ni la candidata del paquet "
"«%s» ja que no estan disponibles cap de les dues"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "S'està instaŀlant %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "S'està configurant el paquet %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "S'està suprimint el paquet %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "S'ha suprimit completament %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "S'està anotant la desaparició de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "S'està executant l'activador de postinstaŀlació %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Manca el directori «%s»"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "No s'ha pogut obrir el fitxer «%s»"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "S'està preparant el paquet %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Unpacking %s"
-msgstr "S'està desempaquetant %s"
+msgid "Unable to parse Release file %s"
+msgstr "No es pot analitzar el fitxer Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Preparing to configure %s"
-msgstr "S'està preparant per a configurar el paquet %s"
+msgid "No sections in Release file %s"
+msgstr "No hi ha seccions al fitxer Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Installed %s"
-msgstr "S'ha instaŀlat el paquet %s"
+msgid "No Hash entry in Release file %s"
+msgstr "No hi ha una entrada Hash al fitxer Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "S'està preparant per a la supressió del paquet %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "El camp «Valid-Until» al fitxer Release %s és invàlid"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Removed %s"
-msgstr "S'ha suprimit el paquet %s"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "El camp «Date» al fitxer Release %s és invàlid"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "S'està preparant per a suprimir completament el paquet %s"
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Completely removed %s"
-msgstr "S'ha suprimit completament el paquet %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "No es pot escriure en %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr "S'ha interromput l'operació abans que pogués finalitzar"
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr "No s'ha escrit cap informe perquè ja s'ha superat MaxReports"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "S'han produït problemes de depències, es deixa sense configurar"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"No s'ha escrit cap informe perquè el missatge d'error indica que és un error "
-"consequent de una fallida anterior."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
-"disc ple"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
-"falta de memòria"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
-"disc ple"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"No s'ha escrit cap informe perquè el missatge d'error indica d'una fallida "
-"d'E/S del dpkg"
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"No s'ha pogut bloquejar el directori d'administració (%s), hi ha cap altre "
-"procés utilitzant-lo?"
+msgid "%limin %lis"
+msgstr "%limin %lis"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "No es pot blocar el directori d'administració (%s), sou root?"
+msgid "%lis"
+msgstr "%lis"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"S'ha interromput el dpkg, hauríeu d'executar manualment «%s» per a corregir "
-"el problema."
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "No blocat"
+msgid "Selection %s not found"
+msgstr "No s'ha trobat la selecció %s"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3355,35 +3208,6 @@ msgstr "…"
msgid "%c%s... %u%%"
msgstr "%c%s… %u%%"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "No s'ha trobat la selecció %s"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "No es pot transferir un fitxer buit a memòria"
@@ -3449,109 +3273,280 @@ msgstr "No es pot obtenir informació del punt de muntatge %s"
msgid "Failed to stat the cdrom"
msgstr "No s'ha pogut fer «stat» del cdrom"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Abreujament de tipus no reconegut: «%c»"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "S'està obrint el fitxer de configuració %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, 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:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Error sintàctic %s:%u: Etiqueta malformada"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, 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:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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:881
+#: apt-pkg/contrib/configuration.cc:887
#, 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:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Error sintàctic %s:%u: Inclusió des d'aquí"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Error sintàctic %s:%u: Directriu no suportada «%s»"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Error sintàctic %s:%u: la directiva clear requereix un arbre d'opcions com a "
"argument"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, 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/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, 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."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, 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:171
+#: apt-pkg/contrib/cmndline.cc:174
#, 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:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, 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:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Opció %s: Paràmetre de configuració ha de ser en la forma =<val>"
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, 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:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "L'opció '%s' és massa llarga"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, 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)."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Operació no vàlida %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "S'està instaŀlant %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "S'està configurant el paquet %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "S'està suprimint el paquet %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "S'ha suprimit completament %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "S'està anotant la desaparició de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "S'està executant l'activador de postinstaŀlació %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Manca el directori «%s»"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "No s'ha pogut obrir el fitxer «%s»"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "S'està preparant el paquet %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "S'està desempaquetant %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "S'està preparant per a configurar el paquet %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "S'ha instaŀlat el paquet %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "S'està preparant per a la supressió del paquet %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "S'ha suprimit el paquet %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "S'està preparant per a suprimir completament el paquet %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "S'ha suprimit completament el paquet %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "No es pot escriure en %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "S'ha interromput l'operació abans que pogués finalitzar"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr "No s'ha escrit cap informe perquè ja s'ha superat MaxReports"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "S'han produït problemes de depències, es deixa sense configurar"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"No s'ha escrit cap informe perquè el missatge d'error indica que és un error "
+"consequent de una fallida anterior."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
+"disc ple"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
+"falta de memòria"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
+"disc ple"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"No s'ha escrit cap informe perquè el missatge d'error indica d'una fallida "
+"d'E/S del dpkg"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"No s'ha pogut bloquejar el directori d'administració (%s), hi ha cap altre "
+"procés utilitzant-lo?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "No es pot blocar el directori d'administració (%s), sou root?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"S'ha interromput el dpkg, hauríeu d'executar manualment «%s» per a corregir "
+"el problema."
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "No blocat"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "DropNode crida a un node que encara està enllaçat"
@@ -3656,7 +3651,7 @@ msgstr "Aquest no és un arxiu DEB vàlid, falta el membre «%s»"
msgid "Internal error, could not locate member %s"
msgstr "Error intern, no s'ha pogut localitzar al membre %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "El fitxer de control no es pot analitzar"
@@ -3685,23 +3680,23 @@ msgstr "L'arxiu és massa petit"
msgid "Failed to read the archive headers"
msgstr "Ha fallat la lectura de les capçaleres de l'arxiu"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "No es poden crear els conductes"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "No es pot executar el gzip "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Arxiu corromput"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "La suma de comprovació de tar ha fallat, arxiu corromput"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Capçalera TAR desconeguda del tipus %u, membre %s"
diff --git a/po/cs.po b/po/cs.po
index a98c0bcc6..3f6bcb4a7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2014-10-05 06:09+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -22,144 +22,144 @@ msgstr ""
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:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Celkem názvů balíků: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Celkem struktur balíků: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Normálních balíků: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Čistě virtuálních balíků: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Jednoduchých virtuálních balíků: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Smíšených virtuálních balíků: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Chybějících: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Celkem různých verzí: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Celkem různých popisů: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Celkem závislostí: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Celkem vztahů ver/soubor: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Celkem vztahů popis/soubor: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Celkem poskytnutých mapování: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Celkem globovaných řetězců: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Celkem jalového místa: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Celkem přiřazeného místa: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Soubor balíku %s je špatně synchronizovaný."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Nebyly nalezeny žádné balíky"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Musíte zadat alespoň jeden vyhledávací vzor"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Tento příkaz je zastaralý, použijte místo něj „apt-mark showauto“."
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Nelze najít balík %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Soubory balíku:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "Cache není synchronizovaná, nelze se odkázat na soubor balíku"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Vypíchnuté balíky:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(nenalezeno)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Instalovaná verze: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Kandidát: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(žádná)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Vypíchnutý balík: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Tabulka verzí:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
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:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -228,20 +228,20 @@ msgstr ""
" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
"Více informací viz manuálové stránky apt-cache(8) a apt.conf(5).\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Zadejte prosím název tohoto média, např. „Debian 5.0.3 Disk 1“"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Vložte prosím médium do mechaniky a stiskněte enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Selhalo připojení „%s“ na „%s“"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -252,7 +252,7 @@ msgstr ""
"Můžete zkusit zadat přípojný bod CD-ROM volbou --cdrom.\n"
"Více o rozpoznávání CD-ROM a přípojných bodech naleznete v „man apt-cdrom“."
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Tento proces opakujte pro všechna zbývající média."
@@ -288,48 +288,48 @@ msgstr ""
" -c=? Načte tento konfigurační soubor\n"
" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Nelze najít balík pro architekturu „%s“"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Nelze najít balík „%s“ s verzí „%s“"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Nelze najít balík „%s“ z vydání „%s“"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Vybírám „%s“ jako zdrojový balík místo „%s“\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Nelze najít verzi „%s“ balíku „%s“"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Nelze najít balík %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s nastaven jako instalovaný ručně.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s nastaven jako instalovaný automaticky.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -337,29 +337,24 @@ msgstr ""
"Tento příkaz je zastaralý, použijte místo něj „apt-mark auto“ a „apt-mark "
"manual“."
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Nelze uzamknout adresář %s"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Nelze zamknout adresář pro stahování"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
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:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nelze najít zdrojový balík pro %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -368,7 +363,7 @@ msgstr ""
"INFO: Balík „%s“ je spravován v systému pro správu verzí „%s“ na:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -379,69 +374,69 @@ msgstr ""
"použijte:\n"
"bzr branch %s\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Přeskakuje se dříve stažený soubor „%s“\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Nutno stáhnout %sB/%sB zdrojových archivů.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Nutno stáhnout %sB zdrojových archivů.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Stažení zdroje %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Stažení některých archivů selhalo."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Stahování dokončeno v režimu pouze stáhnout"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Přeskakuje se rozbalení již rozbaleného zdroje v %s\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Příkaz pro rozbalení „%s“ selhal.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Zkontrolujte, zda je nainstalován balík „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Příkaz pro sestavení „%s“ selhal.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Synovský proces selhal"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
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:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -450,27 +445,27 @@ msgstr ""
"O architektuře %s nejsou známy žádné informace. Pro nastavení si přečtěte "
"část APT::Architectures v manuálové stránce apt.conf(5)"
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Chyba při zpracování závislostí pro sestavení"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nelze získat závislosti pro sestavení %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žádné závislosti pro sestavení.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -479,20 +474,20 @@ msgstr ""
"závislost %s pro %s nemůže být splněna, protože %s není na balících „%s“ "
"dovolena"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "závislost %s pro %s nemůže být splněna, protože balík %s nebyl nalezen"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Selhalo splnění závislosti %s pro %s: Instalovaný balík %s je příliš nový"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -501,7 +496,7 @@ msgstr ""
"závislost %s pro %s nemůže být splněna, protože kandidátská verze balíku %s "
"nesplňuje požadavek na verzi"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -510,17 +505,17 @@ msgstr ""
"závislost %s pro %s nemůže být splněna, protože balík %s nemá kandidátskou "
"verzi"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Selhalo splnění závislosti %s pro %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, 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:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Chyba při zpracování závislostí pro sestavení"
@@ -628,11 +623,11 @@ msgstr "Jako argument vyžaduje jedno URL"
msgid "Must specify at least one pair url/filename"
msgstr "Musíte zadat aspoň jeden pár url/jméno souboru"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr "Stažení selhalo"
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -656,52 +651,53 @@ msgstr ""
"\n"
" Tento APT pomocník má schopnosti svatého čehokoliv.\n"
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "%s nemůže být označen, protože není nainstalovaný.\n"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s již byl nastaven jako instalovaný ručně.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s již byl nastaven jako instalovaný automaticky.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr "%s již byl podržen v aktuální verzi.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr "%s již nebyl držen v aktuální verzi.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Čekali jsme na %s, ale nebyl tam"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr "%s bude podržen v aktuální verzi.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "Podržení balíku %s v aktuální verzi bylo zrušeno.\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr "Spuštění dpkg selhalo. Jste root?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -962,7 +958,7 @@ msgstr "Spojení datového socketu vypršelo"
msgid "Unable to accept connection"
msgstr "Nelze přijmout spojení"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Problém s kontrolním součtem souboru"
@@ -1051,22 +1047,21 @@ msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i -
msgid "Unable to connect to %s:%s:"
msgstr "Nelze se připojit k %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Vnitřní chyba: Dobrý podpis, ale nelze zjistit otisk klíče?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
-#: methods/gpgv.cc:185
-#, fuzzy
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
-msgstr "Nelze spustit „gpgv“ pro ověření podpisu (je gpgv nainstalováno?)"
+msgstr "Nelze spustit „apt-key“ pro ověření podpisu (je gnupg nainstalováno?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1075,16 +1070,15 @@ msgstr ""
"Podepsaný soubor není platný, obdrženo „%s“ (vyžaduje přístup na síť "
"ověření?)"
-#: methods/gpgv.cc:195
-#, fuzzy
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
-msgstr "Neznámá chyba při spouštění gpgv"
+msgstr "Neznámá chyba při spouštění apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Následující podpisy jsou neplatné:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1096,31 +1090,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr "Prázdné soubory nejsou platnými archivy"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Chyba čtení ze serveru"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Výběr selhal"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Čas spojení vypršel"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupního souboru"
@@ -1128,53 +1122,301 @@ msgstr "Chyba zápisu do výstupního souboru"
msgid "Waiting for headers"
msgstr "Čeká se na hlavičky"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Chybná hlavička"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "Http server poslal neplatnou hlavičku odpovědi"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http server poslal neplatnou hlavičku Content-Length"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http server poslal neplatnou hlavičku Content-Range"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má porouchanou podporu rozsahů"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Neznámý formát data"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Špatné datové záhlaví"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Spojení selhalo"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Vnitřní chyba"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Vypisuje se"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "Existuje %i další verze. Zobrazíte ji přepínačem „-a“."
+msgstr[1] "Existují %i další verze. Zobrazíte je přepínačem „-a“."
+msgstr[2] "Existuje %i dalších verzí. Zobrazíte je přepínačem „-a“."
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Opravují se závislosti…"
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " selhalo."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Nelze opravit závislosti"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Nelze minimalizovat sadu pro aktualizaci"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Hotovo"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Pro opravení můžete spustit „apt-get -f install“."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nesplněné závislosti. Zkuste použít -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "neznámá"
+
+#: apt-private/private-output.cc:265
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[instalovaný,aktualizovatelný na: %s]"
+
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr "[instalovaný,lokální]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[instalovaný,automaticky-odstranitelný]"
+
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr "[instalovaný,automaticky]"
+
+#: apt-private/private-output.cc:274
+msgid "[installed]"
+msgstr "[instalovaný]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[aktualizovatelný z: %s]"
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr "[zbytkové-konfigurační-coubory]"
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "ale %s je nainstalován"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ale %s se bude instalovat"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "ale nedá se nainstalovat"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "ale je to virtuální balík"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "ale není nainstalovaný"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "ale nebude se instalovat"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " nebo"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Následující balíky mají nesplněné závislosti:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Následující NOVÉ balíky budou nainstalovány:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Následující balíky budou ODSTRANĚNY:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Následující balíky jsou podrženy v aktuální verzi:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Následující balíky budou aktualizovány:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Následující balíky budou DEGRADOVÁNY:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Následující podržené balíky budou změněny:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (kvůli %s) "
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aktualizováno, %lu nově instalováno, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu přeinstalováno, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu degradováno, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu k odstranění a %lu neaktualizováno.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Chyba při kompilaci regulárního výrazu - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Příkaz update neakceptuje žádné argumenty"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"%i balík může být aktualizován. Zobrazíte jej „apt list --upgradable“.\n"
+msgstr[1] ""
+"%i balíky mohou být aktualizovány. Zobrazíte je „apt list --upgradable“.\n"
+msgstr[2] ""
+"%i balíků může být aktualizováno. Zobrazíte je „apt list --upgradable“.\n"
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr "Všechny balíky jsou aktuální."
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "Řadí se"
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "Existuje %i další záznam. Zobrazíte jej přepínačem „-a“."
+msgstr[1] "Existují %i další záznamy. Zobrazíte je přepínačem „-a“."
+msgstr[2] "Existuje %i dalších záznamů. Zobrazíte je přepínačem „-a“."
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "není skutečný balík (virtuální)"
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"INFO: Toto je pouze simulace!\n"
+" apt-get vyžaduje pro skutečný běh rootovská oprávnění.\n"
+" Mějte také na paměti, že je vypnuto zamykání, tudíž\n"
+" tyto výsledky nemusí mít s realitou nic společného!"
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Vnitřní chyba, InstallPackages byl zavolán s porušenými balíky!"
@@ -1439,254 +1681,6 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Balík „%s“ není nainstalován, nelze tedy odstranit\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "Vypisuje se"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] "Existuje %i další verze. Zobrazíte ji přepínačem „-a“."
-msgstr[1] "Existují %i další verze. Zobrazíte je přepínačem „-a“."
-msgstr[2] "Existuje %i dalších verzí. Zobrazíte je přepínačem „-a“."
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Opravují se závislosti…"
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " selhalo."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Nelze opravit závislosti"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Nelze minimalizovat sadu pro aktualizaci"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Hotovo"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Pro opravení můžete spustit „apt-get -f install“."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nesplněné závislosti. Zkuste použít -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "neznámá"
-
-#: apt-private/private-output.cc:265
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[instalovaný,aktualizovatelný na: %s]"
-
-#: apt-private/private-output.cc:268
-msgid "[installed,local]"
-msgstr "[instalovaný,lokální]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr "[instalovaný,automaticky-odstranitelný]"
-
-#: apt-private/private-output.cc:272
-msgid "[installed,automatic]"
-msgstr "[instalovaný,automaticky]"
-
-#: apt-private/private-output.cc:274
-msgid "[installed]"
-msgstr "[instalovaný]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[aktualizovatelný z: %s]"
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr "[zbytkové-konfigurační-coubory]"
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "ale %s je nainstalován"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ale %s se bude instalovat"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "ale nedá se nainstalovat"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "ale je to virtuální balík"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "ale není nainstalovaný"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "ale nebude se instalovat"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " nebo"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Následující balíky mají nesplněné závislosti:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Následující NOVÉ balíky budou nainstalovány:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Následující balíky budou ODSTRANĚNY:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Následující balíky jsou podrženy v aktuální verzi:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Následující balíky budou aktualizovány:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Následující balíky budou DEGRADOVÁNY:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Následující podržené balíky budou změněny:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (kvůli %s) "
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aktualizováno, %lu nově instalováno, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu přeinstalováno, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu degradováno, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu k odstranění a %lu neaktualizováno.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu instalováno nebo odstraněno pouze částečně.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[y/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Chyba při kompilaci regulárního výrazu - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Příkaz update neakceptuje žádné argumenty"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"%i balík může být aktualizován. Zobrazíte jej „apt list --upgradable“.\n"
-msgstr[1] ""
-"%i balíky mohou být aktualizovány. Zobrazíte je „apt list --upgradable“.\n"
-msgstr[2] ""
-"%i balíků může být aktualizováno. Zobrazíte je „apt list --upgradable“.\n"
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr "Všechny balíky jsou aktuální."
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] "Existuje %i další záznam. Zobrazíte jej přepínačem „-a“."
-msgstr[1] "Existují %i další záznamy. Zobrazíte je přepínačem „-a“."
-msgstr[2] "Existuje %i dalších záznamů. Zobrazíte je přepínačem „-a“."
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "není skutečný balík (virtuální)"
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"INFO: Toto je pouze simulace!\n"
-" apt-get vyžaduje pro skutečný běh rootovská oprávnění.\n"
-" Mějte také na paměti, že je vypnuto zamykání, tudíž\n"
-" tyto výsledky nemusí mít s realitou nic společného!"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1740,20 +1734,24 @@ msgid "Full Text Search"
msgstr "Fulltextové hledání"
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Cíl "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Cíl:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Mám:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Mám:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1779,17 +1777,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Nelze číst %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1861,7 +1859,7 @@ msgstr "chyby nad touto hláškou. Opravte je a poté znovu spusťte [I]nstalova
msgid "Merging available information"
msgstr "Slučují se dostupné informace"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1884,46 +1882,46 @@ msgstr ""
" -c=? Načte tento konfigurační soubor\n"
" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, c-format
msgid "Unable to mkstemp %s"
msgstr "Nelze zavolat mkstemp %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Nelze zapsat do %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nelze určit verzi programu debconf. Je debconf nainstalován?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Seznam rozšíření balíku je příliš dlouhý"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Chyba zpracování adresáře %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Seznam zdrojových rozšíření je příliš dlouhý"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Chyba při zapisování hlavičky do souboru"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Chyba při zpracovávání obsahu %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -2003,11 +2001,11 @@ msgstr ""
" -c=? Načte tento konfigurační soubor\n"
" -o=? Nastaví libovolnou volbu"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Žádný výběr nevyhověl"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, 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"
@@ -2118,22 +2116,22 @@ msgstr " Odlinkovací limit %sB dosažen.\n"
msgid "Archive had no package field"
msgstr "Archiv nemá pole Package"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nemá žádnou položku pro override\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správce %s je %s, ne %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nemá žádnou zdrojovou položku pro override\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nemá ani žádnou binární položku pro override\n"
@@ -2219,7 +2217,7 @@ msgstr "Problém s odlinkováním %s"
msgid "Failed to rename %s to %s"
msgstr "Selhalo přejmenování %s na %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2243,11 +2241,11 @@ msgstr ""
" -c=? Načte daný konfigurační soubor\n"
" -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Neznámý záznam o balíku!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2319,6 +2317,26 @@ msgstr "Nelze najít autentizační záznam pro: %s"
msgid "Hash mismatch for: %s"
msgstr "Neshoda kontrolních součtů pro: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Ovladač metody %s nemohl být nalezen."
+
+#: apt-pkg/acquire-worker.cc:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "Je balík %s nainstalován?"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nebyla spuštěna správně"
+
+#: apt-pkg/acquire-worker.cc:485
+#, 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."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2332,176 +2350,296 @@ msgstr "Pro nápravu těchto problémů můžete zkusit spustit apt-get update"
msgid "The list of sources could not be read."
msgstr "Nelze přečíst seznam zdrojů."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Cache balíků je prázdná"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Cache soubor balíků je poškozen"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Cache soubor balíků má nekompatibilní verzi"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr "Cache soubor balíků je poškozen, je příliš malý"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Tato APT nepodporuje systém pro správu verzí „%s“"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Cache balíků byla vytvořena pro jinou architekturu"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Závisí na"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Předzávisí na"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Navrhuje"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Doporučuje"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Koliduje s"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Nahrazuje"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Zastarává"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Porušuje"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Rozšiřuje"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "důležitý"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "vyžadovaný"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "standardní"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "volitelný"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "extra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
-#, fuzzy
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
-msgstr "Propočítává se aktualizace… "
+msgstr "Propočítává se aktualizace"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ovladač metody %s nemohl být nalezen."
+msgid "Index file type '%s' is not supported"
+msgstr "Indexový typ souboru „%s“ není podporován"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, c-format
-msgid "Is the package %s installed?"
-msgstr "Je balík %s nainstalován?"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Zkomolená část %u v seznamu zdrojů %s (zpracování URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nebyla spuštěna správně"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (nezpracovatelná [volba])"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, 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."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (příliš krátká [volba])"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexový typ souboru „%s“ není podporován"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] není přiřazení)"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Vytváří se strom závislostí"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] nemá klíč)"
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidátské verze"
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] klíč %s nemá hodnotu)"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generování závislostí"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Načítají se stavové informace"
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)"
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nelze otevřít stavový soubor %s"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:217
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nelze zapsat dočasný stavový soubor %s"
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (absolutní dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, 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:335
+#, c-format
+msgid "Opening %s"
+msgstr "Otevírá se %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, 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:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
+
+#: apt-pkg/sourcelist.cc:375
+#, 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ý"
+
+#: apt-pkg/sourcelist.cc:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ „%s“ v části %u v seznamu zdrojů %s není známý"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr "Vyčištění %s není podporováno"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nebylo možno vyhodnotit %s."
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Cache má nekompatibilní systém správy verzí"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Chyba při zpracování %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:273
+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 umí zpracovat."
+
+#: apt-pkg/pkgcachegen.cc:276
+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 umí zpracovat."
+
+#: apt-pkg/pkgcachegen.cc:279
+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:282
+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 umí zpracovat."
+
+#: apt-pkg/pkgcachegen.cc:591
+#, 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:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Načítají se seznamy balíků"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Collecting File poskytuje"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Chyba IO při ukládání zdrojové cache"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Scénář odeslán řešiteli"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Požadavek odeslán řešiteli"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Příprava na obdržení řešení"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "Spuštění externího řešitele"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "přejmenování selhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Neshoda kontrolních součtů"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Velikosti nesouhlasí"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
msgid "Invalid file format"
msgstr "Neplatná formát souboru"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Chyba zápisu"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
#, fuzzy
msgid "Does not start with a cleartext signature"
msgstr "Soubor %s nezačíná podpisem"
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2511,7 +2649,7 @@ msgstr ""
"se použijí předchozí indexové soubory. Chyba GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "Chyba GPG: %s: %s"
@@ -2527,14 +2665,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2543,16 +2681,16 @@ msgstr ""
"V souboru Release nelze najít očekávanou položku „%s“ (chybný sources.list "
"nebo porušený soubor)"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "V souboru Release nelze najít kontrolní součet „%s“"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
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:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2561,19 +2699,19 @@ msgstr ""
"Soubor Release pro %s již expiroval (neplatný od %s). Aktualizace z tohoto "
"repositáře se nepoužijí."
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2582,124 +2720,54 @@ msgstr ""
"Nebylo možné 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:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Nelze najít zdroj pro stažení verze „%s“ balíku „%s“"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, 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/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Cache má nekompatibilní systém správy verzí"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Chyba při zpracování %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:273
-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 umí zpracovat."
-
-#: apt-pkg/pkgcachegen.cc:276
-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 umí zpracovat."
-
-#: apt-pkg/pkgcachegen.cc:279
-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:282
-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 umí zpracovat."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, 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:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Načítají se seznamy balíků"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Collecting File poskytuje"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Chyba IO při ukládání zdrojové cache"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Blok výrobce %s neobsahuje otisk klíče"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Adresář seznamů %spartial chybí."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Archivní adresář %spartial chybí."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, c-format
-msgid "Clean of %s is not supported"
-msgstr "Vyčištění %s není podporováno"
+msgid "Unable to lock directory %s"
+msgstr "Nelze uzamknout adresář %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Stahuje se soubor %li z %li (zbývá %s)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Stahuje se soubor %li z %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-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/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Do sources.list musíte zadat „zdrojové“ URI"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nebylo možno vyhodnotit %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2723,7 +2791,7 @@ msgstr "Nerozumím vypíchnutí typu %s"
msgid "No priority (or zero) specified for pin"
msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2732,12 +2800,12 @@ msgstr ""
"Nelze spustit okamžitou konfiguraci balíku „%s“. Podrobnosti naleznete v man "
"5 apt.conf v části APT::Immediate-Configure. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr "Nelze nastavit „%s“."
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2748,10 +2816,13 @@ msgstr ""
"smyčce v Conflicts/Pre-Depends. To je často špatné, ale pokud to skutečně "
"chcete udělat, aktivujte možnost APT::Force-LoopBreak."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+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/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2822,11 +2893,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Kopírují se seznamy balíků…"
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Zapisuje se nový seznam balíků\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Seznamy zdrojů na tomto disku jsou:\n"
@@ -2836,7 +2907,7 @@ 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:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2844,139 +2915,40 @@ msgstr ""
"Chyba, pkgProblemResolver::Resolve vytváří poruchy, to může být způsobeno "
"podrženými balíky."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nelze opravit problémy, některé balíky držíte v porouchaném stavu."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "Scénář odeslán řešiteli"
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr "Požadavek odeslán řešiteli"
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr "Příprava na obdržení řešení"
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr "Externí řešitel selhal, aniž by zanechal rozumnou chybovou hlášku"
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr "Spuštění externího řešitele"
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Nelze zpracovat soubor %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Nelze zpracovat soubor %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nelze zpracovat Release soubor %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Release soubor %s neobsahuje žádné sekce"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Release soubor %s neobsahuje Hash záznam"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Neplatná položka „Valid-Until“ v Release souboru %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Neplatná položka „Date“ v Release souboru %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Zkomolená část %u v seznamu zdrojů %s (zpracování URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (nezpracovatelná [volba])"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (příliš krátká [volba])"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] není přiřazení)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] nemá klíč)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s ([%s] klíč %s nemá hodnotu)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)"
-
-#: apt-pkg/sourcelist.cc:211
-#, 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Vytváří se strom závislostí"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (absolutní dist)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidátské verze"
-#: apt-pkg/sourcelist.cc:224
-#, 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/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generování závislostí"
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Otevírá se %s"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Načítají se stavové informace"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
+msgid "Failed to open StateFile %s"
+msgstr "Nelze otevřít stavový soubor %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/depcache.cc:258
#, 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ý"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nelze zapsat dočasný stavový soubor %s"
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typ „%s“ v části %u v seznamu zdrojů %s není známý"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Nelze zpracovat soubor %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2988,42 +2960,42 @@ msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno"
msgid "Version '%s' for '%s' was not found"
msgstr "Verze „%s“ pro „%s“ nebyla nalezena"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Nelze najít úlohu „%s“"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nelze najít balík vyhovující regulárnímu výrazu „%s“"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Nelze najít balík vyhovující masce „%s“"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Nelze vybrat verze balíku „%s“, protože je čistě virtuální"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "Nelze vybrat nejnovější verzi balíku „%s“, protože je čistě virtuální"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "Nelze vybrat kandidátskou verzi balíku %s, protože žádnou nemá"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "Nelze vybrat nainstalované verze balíku %s, protože není nainstalován"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3032,177 +3004,59 @@ msgstr ""
"Nelze vybrat nainstalovanou ani kandidátskou verzi balíku „%s“, protože "
"žádné takové verze nemá"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Instaluje se %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Nastavuje se %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Odstraňuje se %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "Kompletně se odstraňuje %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Značím si zmizení %s"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Spouští se poinstalační spouštěč %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Adresář „%s“ chybí"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Nelze otevřít soubor „%s“"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Připravuje se %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "Rozbaluje se %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Preparing to configure %s"
-msgstr "Připravuje se nastavení %s"
+msgid "Unable to parse Release file %s"
+msgstr "Nelze zpracovat Release soubor %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Installed %s"
-msgstr "Nainstalován %s"
+msgid "No sections in Release file %s"
+msgstr "Release soubor %s neobsahuje žádné sekce"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Připravuje se odstranění %s"
+msgid "No Hash entry in Release file %s"
+msgstr "Release soubor %s neobsahuje Hash záznam"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Removed %s"
-msgstr "Odstraněn %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Neplatná položka „Valid-Until“ v Release souboru %s"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Připravuje se úplné odstranění %s"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Neplatná položka „Date“ v Release souboru %s"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Completely removed %s"
-msgstr "Kompletně odstraněn %s"
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Can not write log (%s)"
-msgstr "Nelze zapsat log (%s)"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr "Je /dev/pts připojeno?"
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr "Je standardní výstup terminál?"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr "Operace byla přerušena dříve, než mohla skončit"
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-"Žádné apport hlášení nebylo vytvořeno, protože již byl dosažen MaxReports"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "problémy se závislostmi - ponechávám nezkonfigurované"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
-"se jedná o chybu způsobenou předchozí chybou."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
-"je chyba způsobena zcela zaplněným diskem."
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
-"je chyba způsobena zcela zaplněnou pamětí."
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
-"je chyba na lokálním systému."
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje V/V "
-"chybu dpkg."
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr "Nelze uzamknout administrační adresář (%s). Používá jej jiný proces?"
+msgid "%limin %lis"
+msgstr "%limin %lis"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Nelze uzamknout administrační adresář (%s). Jste root?"
+msgid "%lis"
+msgstr "%lis"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „%s“."
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Není uzamčen"
+msgid "Selection %s not found"
+msgstr "Výběr %s nenalezen"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3337,35 +3191,6 @@ msgstr "…"
msgid "%c%s... %u%%"
msgstr "%c%s… %u%%"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Výběr %s nenalezen"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Nelze provést mmap prázdného souboru"
@@ -3429,110 +3254,277 @@ msgstr "Nelze vyhodnotit přípojný bod %s"
msgid "Failed to stat the cdrom"
msgstr "Nezdařilo se vyhodnotit cdrom"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Nerozpoznaná zkratka typu: „%c“"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Otevírá se konfigurační soubor %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, 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:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaktická chyba %s:%u: Zkomolená značka"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, 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:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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:881
+#: apt-pkg/contrib/configuration.cc:887
#, 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:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaktická chyba %s:%u: Zahrnuto odtud"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva „%s“"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Syntaktická chyba %s:%u: Direktiva clear vyžaduje jako argument strom "
"možností"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, 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/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Parametr příkazové řádky „%c“ [z %s] je neznámý"
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Nerozumím parametru %s příkazové řádky"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Parametr příkazové řádky %s není pravdivostní hodnota"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Volba %s vyžaduje argument."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Parametr %s: Zadání konfigurační položky musí obsahovat =<hodn>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "Volba %s vyžaduje jako argument celé číslo (integer), ne „%s“"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Volba „%s“ je příliš dlouhá"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, 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:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Neplatná operace %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Instaluje se %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Nastavuje se %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Odstraňuje se %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "Kompletně se odstraňuje %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Značím si zmizení %s"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Spouští se poinstalační spouštěč %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Adresář „%s“ chybí"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Nelze otevřít soubor „%s“"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Připravuje se %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Rozbaluje se %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Připravuje se nastavení %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "Nainstalován %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Připravuje se odstranění %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "Odstraněn %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Připravuje se úplné odstranění %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "Kompletně odstraněn %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, c-format
+msgid "Can not write log (%s)"
+msgstr "Nelze zapsat log (%s)"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr "Je /dev/pts připojeno?"
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "Operace byla přerušena dříve, než mohla skončit"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+"Žádné apport hlášení nebylo vytvořeno, protože již byl dosažen MaxReports"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "problémy se závislostmi - ponechávám nezkonfigurované"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
+"se jedná o chybu způsobenou předchozí chybou."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
+"je chyba způsobena zcela zaplněným diskem."
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
+"je chyba způsobena zcela zaplněnou pamětí."
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje, že "
+"je chyba na lokálním systému."
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Žádné apport hlášení nebylo vytvořeno, protože chybová hláška naznačuje V/V "
+"chybu dpkg."
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr "Nelze uzamknout administrační adresář (%s). Používá jej jiný proces?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nelze uzamknout administrační adresář (%s). Jste root?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „%s“."
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Není uzamčen"
+
#: 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"
@@ -3637,7 +3629,7 @@ msgstr "Toto není platný DEB archiv, chybí část „%s“"
msgid "Internal error, could not locate member %s"
msgstr "Vnitřní chyba, nelze najít část %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Nezpracovatelný kontrolní soubor"
@@ -3666,23 +3658,23 @@ msgstr "Archiv je příliš krátký"
msgid "Failed to read the archive headers"
msgstr "Chyba při čtení hlaviček archivu"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Selhalo vytvoření roury"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Selhalo spuštění gzipu "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Porušený archiv"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Kontrolní součet taru selhal, archiv je poškozený"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Neznámá hlavička TARu typ %u, člen %s"
@@ -3699,6 +3691,9 @@ msgstr "Neznámá hlavička TARu typ %u, člen %s"
#~ msgid "No keyring installed in %s."
#~ msgstr "V %s není nainstalována žádná klíčenka."
+#~ msgid "Is stdout a terminal?"
+#~ msgstr "Je standardní výstup terminál?"
+
#~ msgid "ioctl(TIOCGWINSZ) failed"
#~ msgstr "volání ioctl(TIOCGWINSZ) selhalo"
diff --git a/po/cy.po b/po/cy.po
index a25e4be08..b05bc7c59 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2005-06-06 13:46+0100\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -20,164 +20,164 @@ msgstr ""
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:317
+#: cmdline/apt-cache.cc:320
#, fuzzy
msgid "Total package names: "
msgstr "Cyfanswm Enwau Pecynnau : "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid "Total package structures: "
msgstr "Cyfanswm Enwau Pecynnau : "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
#, fuzzy
msgid " Normal packages: "
msgstr " Pecynnau Normal: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
#, fuzzy
msgid " Pure virtual packages: "
msgstr " Pecynnau Cwbl Rhithwir: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
#, fuzzy
msgid " Single virtual packages: "
msgstr " Pecynnau Rhithwir Sengl: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
#, fuzzy
msgid " Mixed virtual packages: "
msgstr " Pecynnau Rhithwir Cymysg: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Ar Goll: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
#, fuzzy
msgid "Total distinct versions: "
msgstr "Cyfanswm Fersiynau Gwahanol: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
#, fuzzy
msgid "Total distinct descriptions: "
msgstr "Cyfanswm Fersiynau Gwahanol: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
#, fuzzy
msgid "Total dependencies: "
msgstr "Cyfanswm Dibyniaethau: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
#, fuzzy
msgid "Total ver/file relations: "
msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
#, fuzzy
msgid "Total Desc/File relations: "
msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
#, fuzzy
msgid "Total Provides mappings: "
msgstr "Cyfanswm Mapiau Darpariath: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
#, fuzzy
msgid "Total globbed strings: "
msgstr "Cyfanswm Llinynau Glob: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
#, fuzzy
msgid "Total slack space: "
msgstr "Cyfanswm gofod Slac: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
#, fuzzy
msgid "Total space accounted for: "
msgstr "Cyfanswm Gofod Cyfrifwyd: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Canfuwyd dim pecyn"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
#, fuzzy
msgid "You must give at least one search pattern"
msgstr "Rhaid i chi ddarparu un patrwm yn union"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Ni ellir lleoli'r pecyn %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
#, fuzzy
msgid "Package files:"
msgstr "Ffeiliau Pecynnau:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
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"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
#, fuzzy
msgid "Pinned packages:"
msgstr "Pecynnau wedi eu Pinio:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(heb ganfod)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Wedi Sefydlu: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Ymgeisydd: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(dim)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
#, fuzzy
msgid " Package pin: "
msgstr " Pin Pecyn: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
#, fuzzy
msgid " Version table:"
msgstr " Tabl Fersiynnau:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, 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:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -250,11 +250,11 @@ msgstr ""
" -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:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
#, fuzzy
msgid "Please insert a Disc in the drive and press enter"
msgstr ""
@@ -262,12 +262,12 @@ msgstr ""
" '%s'\n"
"yn y gyrriant '%s' a gwasgwch Enter\n"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Methwyd ailenwi %s at %s"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -275,7 +275,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
@@ -312,84 +312,79 @@ msgstr ""
" -c=? Darllen y ffeil cyfluniad\n"
" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
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:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -397,95 +392,95 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, fuzzy, c-format
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, 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:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
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:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, 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:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -494,7 +489,7 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -503,14 +498,14 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, 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:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -519,7 +514,7 @@ 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:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -528,17 +523,17 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
@@ -649,11 +644,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -667,52 +662,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "ond nid yw wedi ei sefydlu"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, fuzzy, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Arhoswyd am %s ond nid oedd e yna"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "Methwyd agor %s"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -940,7 +936,7 @@ msgstr "Goramserodd cysylltiad y soced data"
msgid "Unable to accept connection"
msgstr "Methwyd derbyn cysylltiad"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Problem wrth stwnshio ffeil"
@@ -1030,37 +1026,37 @@ msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Methwyd cysylltu i %s %s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr ""
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1070,32 +1066,32 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Gwall wrth ysgrifennu at y ffeil"
-#: methods/http.cc:529
+#: methods/http.cc:531
#, 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:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Gwall wrth ddarllen o'r gweinydd"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Gwall wrth ysgrifennu at ffeil"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Methwyd dewis"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Goramserodd y cysylltiad"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
@@ -1103,58 +1099,304 @@ msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
msgid "Waiting for headers"
msgstr "Yn aros am benawdau"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Llinell pennawd gwael"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
#, fuzzy
msgid "The HTTP server sent an invalid reply header"
msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
-#: methods/server.cc:172
+#: methods/server.cc:173
#, fuzzy
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
-#: methods/server.cc:195
+#: methods/server.cc:193
#, fuzzy
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
-#: methods/server.cc:197
+#: methods/server.cc:195
#, fuzzy
msgid "This HTTP server has broken range support"
msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Fformat dyddiad anhysbys"
-#: methods/server.cc:497
+#: methods/server.cc:506
#, fuzzy
msgid "Bad header data"
msgstr "Data pennawd gwael"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Methodd y cysylltiad"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Gwall mewnol"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Yn cywiro dibyniaethau..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " wedi methu."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Ni ellir cywiro dibyniaethau"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni ellir bychanu y set uwchraddio"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Wedi Gorffen"
+
+#: apt-private/private-cachefile.cc:110
+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."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "ond mae %s wedi ei sefydlu"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "ond ni ellir ei sefydlu"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "ond mae'n becyn rhithwir"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "ond nid yw wedi ei sefydlu"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "ond nid yw'n mynd i gael ei sefydlu"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " neu"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Caiff y pecynnau canlynol eu TYNNU:"
+
+#: apt-private/private-output.cc:571
+#, fuzzy
+msgid "The following packages have been kept back:"
+msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
+
+#: apt-private/private-output.cc:592
+#, fuzzy
+msgid "The following packages will be upgraded:"
+msgstr "Caiff y pecynnau canlynol eu uwchraddio"
+
+#: apt-private/private-output.cc:613
+#, fuzzy
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (oherwydd %s) "
+
+#: apt-private/private-output.cc:696
+#, fuzzy
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
+"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
+"ei wneud!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu wedi ailsefydlu, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu wedi eu israddio, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "I"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Gwall crynhoi patrwm - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1409,252 +1651,6 @@ msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
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"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Yn cywiro dibyniaethau..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " wedi methu."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Ni ellir cywiro dibyniaethau"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni ellir bychanu y set uwchraddio"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Wedi Gorffen"
-
-#: apt-private/private-cachefile.cc:110
-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."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "ond mae %s wedi ei sefydlu"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "ond ni ellir ei sefydlu"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "ond mae'n becyn rhithwir"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "ond nid yw wedi ei sefydlu"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "ond nid yw'n mynd i gael ei sefydlu"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " neu"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Caiff y pecynnau canlynol eu TYNNU:"
-
-#: apt-private/private-output.cc:571
-#, fuzzy
-msgid "The following packages have been kept back:"
-msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
-
-#: apt-private/private-output.cc:592
-#, fuzzy
-msgid "The following packages will be upgraded:"
-msgstr "Caiff y pecynnau canlynol eu uwchraddio"
-
-#: apt-private/private-output.cc:613
-#, fuzzy
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (oherwydd %s) "
-
-#: apt-private/private-output.cc:696
-#, fuzzy
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
-"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
-"ei wneud!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu wedi ailsefydlu, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu wedi eu israddio, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "I"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Gwall crynhoi patrwm - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1710,20 +1706,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Presennol "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Presennol:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Cyrchu:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Cyrchu:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Anwybyddu "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Anwybyddu:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Gwall "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Gwall:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1749,17 +1749,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Ni ellir darllen %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1837,7 +1837,7 @@ msgid "Merging available information"
msgstr "Yn cyfuno manylion Ar Gael"
# FIXME: "debian"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
#, fuzzy
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
@@ -1862,47 +1862,47 @@ msgstr ""
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Ni ellir gwneud stat() o %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Ni ellir ysgrifennu i %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, fuzzy, c-format
msgid "Error processing directory %s"
msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, fuzzy, c-format
msgid "Error processing contents %s"
msgstr "Gwall wrth Brosesu Cynnwys %s"
# FIXME: full stops
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
@@ -1984,11 +1984,11 @@ msgstr ""
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Dim dewisiadau'n cyfateb"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, 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'"
@@ -2099,22 +2099,22 @@ msgstr " Tarwyd y terfyn cyswllt %sB.\n"
msgid "Archive had no package field"
msgstr "Doedd dim maes pecyn gan yr archif"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Cynaliwr %s yw %s nid %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
@@ -2202,7 +2202,7 @@ msgid "Failed to rename %s to %s"
msgstr "Methwyd ailenwi %s at %s"
# FIXME: "debian"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2227,11 +2227,11 @@ msgstr ""
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Cofnod pecyn anhysbys!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
#, fuzzy
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
@@ -2305,6 +2305,29 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Camgyfatebiaeth swm MD5"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Methwyd canfod y gyrrydd dull %s."
+
+#: apt-pkg/acquire-worker.cc:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Ni gychwynodd y dull %s yn gywir"
+
+#: apt-pkg/acquire-worker.cc:485
+#, fuzzy, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
@@ -2317,186 +2340,309 @@ msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
msgid "The list of sources could not be read."
msgstr "Methwyd darllen y rhestr ffynhonellau."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Storfa pecyn gwag"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Mae'r ffeil storfa pecyn yn llygredig"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "Mae'r ffeil storfa pecyn yn llygredig"
# FIXME: capitalisation?
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, 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:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Dibynnu"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "CynDdibynnu"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Awgrymu"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Argymell"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Gwrthdaro"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Amnewid"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Darfodi"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "pwysig"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "angenrheidiol"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "safonnol"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "opsiynnol"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "ychwanegol"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
#, fuzzy
msgid "Calculating upgrade"
msgstr "Yn Cyfrifo'r Uwchraddiad"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Methwyd canfod y gyrrydd dull %s."
+msgid "Index file type '%s' is not supported"
+msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-#: apt-pkg/acquire-worker.cc:135
-#, c-format
-msgid "Is the package %s installed?"
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+
+#: apt-pkg/sourcelist.cc:206
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Ni gychwynodd y dull %s yn gywir"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:208
+#, 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:211
+#, 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:217
#, fuzzy, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+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:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
-" '%s'\n"
-"yn y gyrriant '%s' a gwasgwch Enter\n"
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:335
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Opening %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, 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:371
+#, 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:375
+#, 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:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-#, fuzzy
-msgid "Building dependency tree"
-msgstr "Yn Aideladu Coeden Dibyniaeth"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ni ellir gwneud stat() o %s."
-#: apt-pkg/depcache.cc:139
-#, fuzzy
-msgid "Candidate versions"
-msgstr "Fersiynau Posib"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Mae can y storfa system fersiwn anghyfaddas"
-#: apt-pkg/depcache.cc:168
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:273
+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:276
+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:279
#, fuzzy
-msgid "Dependency generation"
-msgstr "Cynhyrchaid Dibyniaeth"
+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/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#: apt-pkg/pkgcachegen.cc:282
+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:591
+#, 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:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
#, fuzzy
-msgid "Reading state information"
-msgstr "Yn cyfuno manylion Ar Gael"
+msgid "Reading package lists"
+msgstr "Yn Darllen Rhestrau Pecynnau"
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Methwyd agor %s"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Yn Casglu Darpariaethau Ffeil"
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "methwyd ailenwi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Gweithred annilys %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Gwall ysgrifennu"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2504,7 +2650,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
@@ -2520,14 +2666,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2535,28 +2681,28 @@ msgid ""
msgstr ""
# FIXME: number?
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
@@ -2564,7 +2710,7 @@ msgid ""
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2573,130 +2719,55 @@ 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:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, 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/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Mae can y storfa system fersiwn anghyfaddas"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:273
-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:276
-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:279
-#, 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:282
-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:591
-#, 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:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-#, fuzzy
-msgid "Reading package lists"
-msgstr "Yn Darllen Rhestrau Pecynnau"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Yn Casglu Darpariaethau Ffeil"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Ni chynhelir y math ffeil mynegai '%s'"
+msgid "Unable to lock directory %s"
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Yn Darllen Rhestr Ffeiliau"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-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."
-
# FIXME: ...file
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
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/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ni ellir gwneud stat() o %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2720,20 +2791,20 @@ msgstr "Methwyd daeall y math pin %s"
msgid "No priority (or zero) specified for pin"
msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "Methwyd agor ffeil %s"
# FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2744,10 +2815,14 @@ 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/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+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/cdrom.cc:571
#, fuzzy
@@ -2815,12 +2890,12 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Yn Darllen Rhestrau Pecynnau"
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
#, fuzzy
msgid "Writing new source list\n"
msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr ""
@@ -2832,7 +2907,7 @@ msgstr ""
"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
"ei gyfer."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2840,148 +2915,45 @@ msgstr ""
"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
"ei achosi gan pecynnau wedi eu dal."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
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/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-# FIXME: number?
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
-
-# FIXME: number?
-#: apt-pkg/indexrecords.cc:83
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-
-#: apt-pkg/indexrecords.cc:91
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:152
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
-
-# FIXME: number?
-#: apt-pkg/indexrecords.cc:171
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+#, fuzzy
+msgid "Building dependency tree"
+msgstr "Yn Aideladu Coeden Dibyniaeth"
-#: apt-pkg/sourcelist.cc:173
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+#: apt-pkg/depcache.cc:139
+#, fuzzy
+msgid "Candidate versions"
+msgstr "Fersiynau Posib"
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+#: apt-pkg/depcache.cc:168
+#, fuzzy
+msgid "Dependency generation"
+msgstr "Cynhyrchaid Dibyniaeth"
-#: apt-pkg/sourcelist.cc:190
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Yn cyfuno manylion Ar Gael"
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:252
#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-
-#: apt-pkg/sourcelist.cc:206
-#, 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:208
-#, 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:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+msgid "Failed to open StateFile %s"
+msgstr "Methwyd agor %s"
-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/depcache.cc:258
#, 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:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Opening %s"
-msgstr "Yn agor %s"
-
-#: apt-pkg/sourcelist.cc:371
-#, 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:375
-#, 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:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2993,208 +2965,103 @@ msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
msgid "Version '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr " Wedi Sefydlu: "
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, fuzzy, c-format
-msgid "Configuring %s"
-msgstr "Yn cysylltu i %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
+# FIXME: number?
+#: apt-pkg/indexrecords.cc:83
#, fuzzy, c-format
-msgid "Removing %s"
-msgstr "Yn agor %s"
+msgid "Unable to parse Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/indexrecords.cc:91
#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Methwyd dileu %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "No sections in Release file %s"
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-#: apt-pkg/deb/dpkgpm.cc:112
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Running post-installation trigger %s"
+msgid "No Hash entry in Release file %s"
msgstr ""
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, fuzzy, c-format
-msgid "Directory '%s' missing"
-msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Methwyd agor ffeil %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, fuzzy, c-format
-msgid "Preparing %s"
-msgstr "Yn agor %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, fuzzy, c-format
-msgid "Unpacking %s"
-msgstr "Yn agor %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:145
#, fuzzy, c-format
-msgid "Preparing to configure %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+# FIXME: number?
+#: apt-pkg/indexrecords.cc:164
#, fuzzy, c-format
-msgid "Installed %s"
-msgstr " Wedi Sefydlu: "
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing for removal of %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, fuzzy, c-format
-msgid "Removed %s"
-msgstr "Argymell"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, fuzzy, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1025
-#, fuzzy, c-format
-msgid "Completely removed %s"
-msgstr "Methwyd dileu %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Ni ellir ysgrifennu i %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
+#, c-format
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "%lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
+msgstr "Ni chanfuwyd y dewis %s"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3331,35 +3198,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Wedi Gorffen"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Ni chanfuwyd y dewis %s"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
@@ -3423,112 +3261,268 @@ msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
msgid "Failed to stat the cdrom"
msgstr "Methwyd gwneud stat() o'r CD-ROM"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Talgryniad math anhysbys: '%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, 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:817
+#: apt-pkg/contrib/configuration.cc:823
#, fuzzy, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, 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:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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:881
+#: apt-pkg/contrib/configuration.cc:887
#, 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:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, fuzzy, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
# FIXME
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, 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:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, 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:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, 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:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Opsiwn '%s' yn rhy hir"
# FIXME: 'Sense'?
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, 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:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Gweithred annilys %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr " Wedi Sefydlu: "
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, fuzzy, c-format
+msgid "Configuring %s"
+msgstr "Yn cysylltu i %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Methwyd dileu %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Methwyd agor ffeil %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, fuzzy, c-format
+msgid "Preparing %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, fuzzy, c-format
+msgid "Preparing to configure %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr " Wedi Sefydlu: "
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, fuzzy, c-format
+msgid "Removed %s"
+msgstr "Argymell"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Methwyd dileu %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Ni ellir ysgrifennu i %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
@@ -3637,7 +3631,7 @@ msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
msgid "Internal error, could not locate member %s"
msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
#, fuzzy
msgid "Unparsable control file"
msgstr "Ffeil rheoli ni ellir ei ramadegu"
@@ -3667,24 +3661,24 @@ msgstr "Mae'r archif yn rhy fyr"
msgid "Failed to read the archive headers"
msgstr "Methwyd darllen pennawdau'r archif"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Methwyd creu pibau"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Methwyd gweithredu gzip"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Archif llygredig"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
#, fuzzy
msgid "Tar checksum failed, archive corrupted"
msgstr "Methodd swm gwirio Tar, archif llygredig"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Math pennawd TAR anhysbys %u, aelod %s"
diff --git a/po/da.po b/po/da.po
index eefea5045..d6b8e07a1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2014-07-06 23:51+0200\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -25,147 +25,147 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Pakken %s version %s har en uopfyldt afhængighed:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Samlet antal pakkenavne: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Samlet antal pakkestrukturer: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Normale pakker: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Rene virtuelle pakker: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Enkelte virtuelle pakker: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Blandede virtuelle pakker: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Manglende: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Totale forskellige versioner: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Sammenlagt forskellige beskrivelser: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Sammenlagt afhængigheder: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Sammenlagt version/fil-relationer: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Sammenlagt version/fil-relationer: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Sammenlagt »Tilbyder«-markeringer: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Totalle søgemønsterstrenge: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Total »Slack«-plads: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Total plads, der kan gøres rede for: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakkefilen %s er ude af trit."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Fandt ingen pakker"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Du skal angive mindst ét søgemønster"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
"Denne kommando er forældet. Brug venligst »apt-mark showauto« i stedet for."
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Kunne ikke lokalisere pakken %s"
# Overskriften til apt-cache policy,
# forkorter "Package" væk. CH
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Pakkefiler:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "Mellemlageret er ude af trit, kan ikke krydsreferere en pakkefil"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "»Pinned« pakker:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(ikke fundet)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Installeret: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Kandidat: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(ingen)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Pakke-pin: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Versionstabel:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s kompileret på %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -235,21 +235,21 @@ msgstr ""
" -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
"Se manualsiderne for apt-cache(8) og apt.conf(5) for flere oplysninger.\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
"Angiv venligst et navn for denne disk, som f.eks. »Debian 5.0.3 Disk 1«"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Indsæt en disk i drevet og tryk retur"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Kunne ikke montere %s til %s"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -261,7 +261,7 @@ msgstr ""
"Se »man apt-cdrom« for yderligere information om automatisk detektering af "
"cd-rom og monteringspunkt."
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Gentag processen for resten af cd'erne i dit sæt."
@@ -297,48 +297,48 @@ msgstr ""
" -c=? Læs denne opsætningsfil\n"
" -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Kan ikke finde en pakke for arkitektur »%s«"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Kan ikke finde en pakke »%s« med version »%s«"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Kan ikke finde en pakke »%s« med udgivelse »%s«"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Vælger »%s« som kildepakke fremfor »%s«\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Kan ikke finde version »%s« for pakke »%s«"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunne ikke finde pakken %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s sat til manuelt installeret.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s sat til automatisk installation.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -346,29 +346,24 @@ msgstr ""
"Denne kommando er forældet. Brug venligst »apt-mark auto« og »apt-mark "
"manual« i stedet for."
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern fejl. Problemløseren ødelagde noget"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Kunne ikke låse mappen %s"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Kunne ikke låse nedhentningsmappen"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "Du skal angive mindst én pakke at hente kildeteksten til"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunne ikke finde kildetekstpakken for %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -377,7 +372,7 @@ msgstr ""
"BEMÆRK: Pakning af »%s« vedligeholdes i versionskontrolsystemet »%s« på:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -388,67 +383,67 @@ msgstr ""
"bzr branch %s\n"
"for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Overspringer allerede hentet fil »%s«\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Henter kildetekst %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Nogle arkiver kunne ikke hentes."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Nedhentning afsluttet i »hent-kun«-tilstand"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Udpakningskommandoen »%s« fejlede.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tjek om pakken »dpkg-dev« er installeret.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Opbygningskommandoen »%s« fejlede.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Barneprocessen fejlede"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -457,27 +452,27 @@ msgstr ""
"Ingen arkitekturinformation tilgængelig for %s. Se apt.conf(5) APT::"
"Architectures for opsætning"
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Kunne ikke behandler opbygningsafhængighederne"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen opbygningsafhængigheder.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -485,7 +480,7 @@ msgid ""
msgstr ""
"Afhængigheden %s for %s kan ikke opfyldes, da %s ikke er tilladt på »%s«"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -493,14 +488,14 @@ msgid ""
msgstr ""
"Afhængigheden %s for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for "
"ny"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -509,7 +504,7 @@ msgstr ""
"Afhængigheden %s for %s kan ikke opfyldes, da ingen af de tilgængelige "
"kandidater for pakken %s kan tilfredsstille versionskravene"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -518,17 +513,17 @@ msgstr ""
"%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke har en "
"kandidatversion"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Kunne ikke behandler opbygningsafhængighederne"
@@ -637,11 +632,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Du skal angive mindst et par i form af adresse/filnavn"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr "Kunne ikke hente pakkerne"
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
#, fuzzy
msgid ""
"Usage: apt-helper [options] command\n"
@@ -665,52 +660,53 @@ msgstr ""
"\n"
" Dette APT-hjælpeprogram har Super Meep Powers.\n"
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "%s kan ikke markeres, da den ikke er installeret.\n"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s var allerede sat til manuelt installeret.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s var allerede sat til automatisk installeret.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr "%s var allerede sat i bero.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr "%s var allerede ikke i bero.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ventede på %s, men den var der ikke"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr "%s sat i bero.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "Afbrød i bero for %s.\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr "Kørsel af dpkg fejlede. Er du root (administrator)?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -974,7 +970,7 @@ msgstr "Tidsudløb på datasokkel-forbindelse"
msgid "Unable to accept connection"
msgstr "Kunne ikke acceptere forbindelse"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Problem ved \"hashing\" af fil"
@@ -1063,24 +1059,24 @@ msgstr "Der skete noget underligt under opløsning af »%s:%s« (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Kunne ikke forbinde til %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
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:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Stødte på mindst én ugyldig signatur."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"Kunne ikke køre »apt-key« for at verificere signaturen (er gnupg "
"installeret?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1089,15 +1085,15 @@ msgstr ""
"Clearsigned-fil er ikke gyldig, fik »%s« (kræver netværket ikke "
"autentificering?)"
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Ukendt fejl ved kørsel af apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Følgende signaturer var ugyldige:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1109,31 +1105,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr "Tomme filer kan ikke være gyldige arkiver"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Fejl ved skrivning til filen"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Fejl ved læsning fra server"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Fejl ved skrivning til fil"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Valg mislykkedes"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Tidsudløb på forbindelsen"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Fejl ved skrivning af uddatafil"
@@ -1141,54 +1137,303 @@ msgstr "Fejl ved skrivning af uddatafil"
msgid "Waiting for headers"
msgstr "Afventer hoveder"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Ugyldig linje i hovedet"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "Http-serveren sendte et ugyldigt svarhovede"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http-serveren sendte et ugyldigt Content-Length-hovede"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-serveren sendte et ugyldigt Content-Range-hovede"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr ""
"Denne http-servere har fejlagtig understøttelse af intervaller (»ranges«)"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Ukendt datoformat"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Ugyldige hoved-data"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Forbindelsen mislykkedes"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Intern fejl"
+# måske visning, kategorisering
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Listing"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+"Der er %i yderlig version. Brug venligst kontakten »-a« til at se den."
+msgstr[1] ""
+"Der er %i yderligere versioner. Brug venligst kontakten »-a« til at se dem."
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Retter afhængigheder ..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " mislykkedes."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Kunne ikke rette afhængigheder"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Kunne ikke minimere opgraderingssættet"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Færdig"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Du kan muligvis rette dette ved at køre »apt-get -f install«."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Uopfyldte afhængigheder. Prøv med -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "ukendt"
+
+#: apt-private/private-output.cc:265
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[installeret,kan opgraderes til: %s]"
+
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr "[Installeret,lokalt]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[installeret,kan auto-fjernes]"
+
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr "[Installeret,automatisk]"
+
+#: apt-private/private-output.cc:274
+msgid "[installed]"
+msgstr "[Installeret]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[kan opgraderes fra: %s]"
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr "[residual-konfig]"
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "men %s er installeret"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s forventes installeret"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "men den kan ikke installeres"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "men det er en virtuel pakke"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "men den er ikke installeret"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "men den bliver ikke installeret"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " eller"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Følgende pakker har uopfyldte afhængigheder:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Følgende NYE pakker vil blive installeret:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Følgende pakker vil blive AFINSTALLERET:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Følgende pakker er blevet holdt tilbage:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Følgende pakker vil blive opgraderet:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Følgende pakker vil blive NEDGRADERET:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Følgende tilbageholdte pakker vil blive ændret:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (grundet %s) "
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n"
+"Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu opgraderes, %lu nyinstalleres, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu geninstalleres, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu nedgraderes, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Fejl ved tolkning af regulært udtryk - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "»update«-kommandoen benytter ingen parametre"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"%i pakke kan opgraderes. Kør »apt list --upgradable« for at se den.\n"
+msgstr[1] ""
+"%i pakker kan opgraderes. Kør »apt list --upgradable« for at se dem.\n"
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr "Alle pakker er opdateret."
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "Sortering"
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+"Der er %i yderligere post. Brug venligst kontakten »-a« for at se den."
+msgstr[1] ""
+"Der er %i yderligere poster. Brug venligst kontakten »-a« for at se dem."
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "ikke en reel pakke (virtuel)"
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"BEMÆRK: Dette er kun en simulering!\n"
+" apt-get kræver rootprivilegier for reel kørsel.\n"
+" Husk også at låsning er deaktiveret,\n"
+" så stol ikke på relevansen for den reelle aktuelle situation!"
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!"
@@ -1451,255 +1696,6 @@ msgstr "Pakke »%s« er ikke installeret, så blev ikke fjernet. Mente du »%s«
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Pakke »%s« er ikke installeret, så blev ikke fjernet\n"
-# måske visning, kategorisering
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "Listing"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-"Der er %i yderlig version. Brug venligst kontakten »-a« til at se den."
-msgstr[1] ""
-"Der er %i yderligere versioner. Brug venligst kontakten »-a« til at se dem."
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Retter afhængigheder ..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " mislykkedes."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Kunne ikke rette afhængigheder"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Kunne ikke minimere opgraderingssættet"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Færdig"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Du kan muligvis rette dette ved at køre »apt-get -f install«."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Uopfyldte afhængigheder. Prøv med -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "ukendt"
-
-#: apt-private/private-output.cc:265
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[installeret,kan opgraderes til: %s]"
-
-#: apt-private/private-output.cc:268
-msgid "[installed,local]"
-msgstr "[Installeret,lokalt]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr "[installeret,kan auto-fjernes]"
-
-#: apt-private/private-output.cc:272
-msgid "[installed,automatic]"
-msgstr "[Installeret,automatisk]"
-
-#: apt-private/private-output.cc:274
-msgid "[installed]"
-msgstr "[Installeret]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[kan opgraderes fra: %s]"
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr "[residual-konfig]"
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "men %s er installeret"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "men %s forventes installeret"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "men den kan ikke installeres"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "men det er en virtuel pakke"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "men den er ikke installeret"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "men den bliver ikke installeret"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " eller"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Følgende pakker har uopfyldte afhængigheder:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Følgende NYE pakker vil blive installeret:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Følgende pakker vil blive AFINSTALLERET:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Følgende pakker er blevet holdt tilbage:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Følgende pakker vil blive opgraderet:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Følgende pakker vil blive NEDGRADERET:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Følgende tilbageholdte pakker vil blive ændret:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (grundet %s) "
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n"
-"Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu opgraderes, %lu nyinstalleres, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu geninstalleres, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu nedgraderes, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Fejl ved tolkning af regulært udtryk - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "»update«-kommandoen benytter ingen parametre"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"%i pakke kan opgraderes. Kør »apt list --upgradable« for at se den.\n"
-msgstr[1] ""
-"%i pakker kan opgraderes. Kør »apt list --upgradable« for at se dem.\n"
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr "Alle pakker er opdateret."
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-"Der er %i yderligere post. Brug venligst kontakten »-a« for at se den."
-msgstr[1] ""
-"Der er %i yderligere poster. Brug venligst kontakten »-a« for at se dem."
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "ikke en reel pakke (virtuel)"
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"BEMÆRK: Dette er kun en simulering!\n"
-" apt-get kræver rootprivilegier for reel kørsel.\n"
-" Husk også at låsning er deaktiveret,\n"
-" så stol ikke på relevansen for den reelle aktuelle situation!"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1753,20 +1749,24 @@ msgid "Full Text Search"
msgstr "Fuldtekst-søgning"
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Havde "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Havde:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Henter:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Henter:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ignorerer "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ignorerer:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Fejl "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Fejl:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1792,17 +1792,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Kunne ikke læse %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1879,7 +1879,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Sammenfletter tilgængelighedsoplysninger"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1903,46 +1903,46 @@ msgstr ""
" -c=? Læs denne opsætningsfil\n"
" -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, c-format
msgid "Unable to mkstemp %s"
msgstr "Kunne ikke mkstemp %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Kunne ikke skrive til %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Kan ikke finde debconfs version. Er debconf installeret?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Pakkeudvidelseslisten er for lang"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Fejl under behandling af mappen %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Kildeudvidelseslisten er for lang"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Fejl under skrivning af hovedet til indholdsfil"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Fejl under behandling af indhold %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -2022,11 +2022,11 @@ msgstr ""
" -c=? Læs denne opsætningsfil\n"
" -o=? Sæt en opsætnings-indstilling"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Ingen valg passede"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Visse filer mangler i pakkefilgruppen »%s«"
@@ -2137,22 +2137,22 @@ msgstr " Nåede DeLink-begrænsningen på %sB.\n"
msgid "Archive had no package field"
msgstr "Arkivet havde intet package-felt"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen tvangs-post\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " pakkeansvarlig for %s er %s, ikke %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen linje med tilsidesættelse af standard for kildefiler\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -2239,7 +2239,7 @@ msgstr "Problem under aflænkning af %s"
msgid "Failed to rename %s to %s"
msgstr "Kunne ikke omdøbe %s til %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2264,11 +2264,11 @@ msgstr ""
" -c=? Læs denne konfigurationsfil\n"
" -o=? Angiv et arbitrærtkonfigurationstilvalg, f.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Ukendt pakkeindgang!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2340,6 +2340,26 @@ msgstr "Kan ikke finde godkendelsesregistrering for: %s"
msgid "Hash mismatch for: %s"
msgstr "Hashsum stemmer ikke: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Metodedriveren %s blev ikke fundet."
+
+#: apt-pkg/acquire-worker.cc:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "Er pakken %s installeret?"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startede ikke korrekt"
+
+#: apt-pkg/acquire-worker.cc:485
+#, 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/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller åbnes."
@@ -2352,174 +2372,297 @@ msgstr "Du kan muligvis rette problemet ved at køre »apt-get update«"
msgid "The list of sources could not be read."
msgstr "Listen med kilder kunne ikke læses."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Tomt pakke-mellemlager"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Pakke-mellemlagerets fil er ødelagt"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Pakke-mellemlagerets fil er af en inkompatibel version"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr "Pakke-mellemlagerets fil er ødelagt, den er for lille"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Denne APT understøtter ikke versionssystemet »%s«"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Pakke-mellemlageret er lavet til en anden arkitektur"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Afhængigheder"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Præ-afhængigheder"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Foreslåede"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Anbefalede"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Konflikter"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Erstatter"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Overflødiggør"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Ødelægger"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Forbedringer"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "vigtig"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "krævet"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "frivillig"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "ekstra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Beregner opgraderingen"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Metodedriveren %s blev ikke fundet."
+msgid "Index file type '%s' is not supported"
+msgstr "Indeksfiler af typen »%s« understøttes ikke"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, c-format
-msgid "Is the package %s installed?"
-msgstr "Er pakken %s installeret?"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Ugyldig stanza %u i kildelisten %s (tolkning af URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startede ikke korrekt"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] kunne ikke fortolkes)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, 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."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] for kort)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Ugyldig linje %lu i kildelisten %s ([%s] er ikke en opgave)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Ugyldig linje %lu i kildelisten %s ([%s] har ingen nøgle)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Ugyldig linje %lu i kildelisten %s ([%s] nøgle %s har ingen værdi)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Ugyldig linje %lu i kildelisten %s (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Ugyldig linje %lu i kildelisten %s (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, 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:217
+#, 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:224
+#, 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:335
+#, c-format
+msgid "Opening %s"
+msgstr "Åbner %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Linjen %u er for lang i kildelisten %s."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Ugyldig linje %u i kildelisten %s (type)"
+
+#: apt-pkg/sourcelist.cc:375
+#, 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:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typen »%s« er ukendt på stanza %u i kildelisten %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "Indeksfiler af typen »%s« understøttes ikke"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Opbygger afhængighedstræ"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Kunne ikke finde %s."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidatversioner"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Mellemlageret benytter en inkompatibel versionsstyring"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Afhængighedsgenerering"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Der opstod en fejl under behandlingen af %s (%s%d)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Læser tilstandsoplysninger"
+#: apt-pkg/pkgcachegen.cc:273
+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:276
+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:279
+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/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:282
+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:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Kunne ikke åbne StateFile %s"
+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/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Kunne ikke skrive den midlertidige StateFile %s"
+msgid "Couldn't stat source package list %s"
+msgstr "Kunne ikke finde kildepakkelisten %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Indlæser pakkelisterne"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Samler filudbud"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "IO-fejl ved gemning af kilde-mellemlageret"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Send scenarie til problemløser"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Send forespørgsel til problemløser"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Forbered for modtagelse af løsning"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "Kør ekstern problemløser"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "omdøbning mislykkedes, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Hashsum stemmer ikke"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Størrelsen stemmer ikke"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
msgid "Invalid file format"
msgstr "Ugyldigt filformat"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Skrivefejl"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2529,7 +2672,7 @@ msgstr ""
"og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fejl: %s: %s"
@@ -2545,14 +2688,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2561,17 +2704,17 @@ msgstr ""
"Kunne ikke finde uventet punkt »%s« i udgivelsesfil (forkert sources.list-"
"punkt eller forkert udformet fil)"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Kunne ikke finde hashsum for »%s« i udgivelsesfilen"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
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:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2580,19 +2723,19 @@ msgstr ""
"Udgivelsesfil for %s er udløbet (ugyldig siden %s). Opdateringer for dette "
"arkiv vil ikke blive anvendt."
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konfliktdistribution: %s (forventede %s men fik %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2601,125 +2744,53 @@ 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:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Kan ikke finde en kilde til at hente version »%s« for »%s«"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, 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/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Mellemlageret benytter en inkompatibel versionsstyring"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Der opstod en fejl under behandlingen af %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:273
-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:276
-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:279
-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:282
-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:591
-#, 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:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kunne ikke finde kildepakkelisten %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Indlæser pakkelisterne"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Samler filudbud"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "IO-fejl ved gemning af kilde-mellemlageret"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Leverandørblok %s inderholder intet fingeraftryk"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Listemappen %spartial mangler."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Arkivmappen %spartial mangler."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Indeksfiler af typen »%s« understøttes ikke"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "Kunne ikke låse mappen %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Henter fil %li ud af %li (%s tilbage)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Henter fil %li ud af %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-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/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
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/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kunne ikke finde %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2743,7 +2814,7 @@ msgstr "Kunne ikke forstå pin-type %s"
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2752,12 +2823,12 @@ msgstr ""
"Kunne ikke udføre øjeblikkelig konfiguration på »%s«. Se venligst man 5 apt."
"conf under APT:Immediate-Cinfigure for detaljer. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr "Kunne ikke åbne filen »%s«. "
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2769,10 +2840,13 @@ msgstr ""
"ide, men hvis du virkelig vil gøre det, kan du aktivere valget »APT::Force-"
"LoopBreak«."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linjen %u er for lang i kildelisten %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+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/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2843,11 +2917,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Kopierer pakkelisterne ..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Skriver ny kildeliste\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Denne disk har følgende kildeliste-indgange:\n"
@@ -2858,7 +2932,7 @@ msgid ""
msgstr ""
"Pakken %s skal geninstalleres, men jeg kan ikke finde noget arkiv med den."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2866,140 +2940,41 @@ msgstr ""
"Fejl, pkgProblemResolver::Resolve satte stopklodser op, det kan skyldes "
"tilbageholdte pakker."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "Send scenarie til problemløser"
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr "Send forespørgsel til problemløser"
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr "Forbered for modtagelse af løsning"
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr "Kør ekstern problemløser"
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Kunne ikke tolke pakkefilen %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Kunne ikke tolke pakkefilen %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Kunne ikke fortolke udgivelsesfil %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Ingen afsnit i udgivelsesfil %s"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Intet hashpunkt i udgivelsesfil %s"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ugyldigt punkt »Valid-Until« i udgivelsesfil %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ugyldigt punkt »Date« i udgivelsesfil %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Ugyldig stanza %u i kildelisten %s (tolkning af URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] kunne ikke fortolkes)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] for kort)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Ugyldig linje %lu i kildelisten %s ([%s] er ikke en opgave)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Ugyldig linje %lu i kildelisten %s ([%s] har ingen nøgle)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Ugyldig linje %lu i kildelisten %s ([%s] nøgle %s har ingen værdi)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Ugyldig linje %lu i kildelisten %s (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Ugyldig linje %lu i kildelisten %s (dist)"
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Opbygger afhængighedstræ"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidatversioner"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Afhængighedsgenerering"
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Åbner %s"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Læser tilstandsoplysninger"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Ugyldig linje %u i kildelisten %s (type)"
+msgid "Failed to open StateFile %s"
+msgstr "Kunne ikke åbne StateFile %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/depcache.cc:258
#, 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"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Kunne ikke skrive den midlertidige StateFile %s"
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typen »%s« er ukendt på stanza %u i kildelisten %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Kunne ikke tolke pakkefilen %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -3011,44 +2986,44 @@ msgstr "Udgaven »%s« for »%s« blev ikke fundet"
msgid "Version '%s' for '%s' was not found"
msgstr "Versionen »%s« for »%s« blev ikke fundet"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Kunne ikke finde opgaven »%s«"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Kunne ikke finde nogle pakker med regulært udtryk »%s«"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Kunne ikke finde nogle pakker med glob »%s«"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Kan ikke vælge versioner fra pakke »%s« som er vitalt"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "Kan ikke vælge nyeste version fra pakke »%s« som er vital"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Kan ikke vælge kandidatversion fra pakke %s da den ikke har nogen kandidat"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Kan ikke vælge installeret version fra pakke %s da den ikke er installeret"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3057,175 +3032,59 @@ msgstr ""
"Kan ikke vælge installeret eller kandidatversion fra pakke »%s« da den ikke "
"har nogen af dem"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Installerer %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Sætter %s op"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Fjerner %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "Fjerner %s helt"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Bemærker forsvinding af %s"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Kører førinstallationsudløser %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Mappe »%s« mangler"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Kunne ikke åbne filen »%s«"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Klargør %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "Pakker %s ud"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Preparing to configure %s"
-msgstr "Gør klar til at sætte %s op"
+msgid "Unable to parse Release file %s"
+msgstr "Kunne ikke fortolke udgivelsesfil %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Installed %s"
-msgstr "Installerede %s"
+msgid "No sections in Release file %s"
+msgstr "Ingen afsnit i udgivelsesfil %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Gør klar til afinstallation af %s"
+msgid "No Hash entry in Release file %s"
+msgstr "Intet hashpunkt i udgivelsesfil %s"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Removed %s"
-msgstr "Fjernede %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ugyldigt punkt »Valid-Until« i udgivelsesfil %s"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Gør klar til at fjerne %s helt"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ugyldigt punkt »Date« i udgivelsesfil %s"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Completely removed %s"
-msgstr "Fjernede %s helt"
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Can not write log (%s)"
-msgstr "Kan ikke skrive log (%s)"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr "Er /dev/pts monteret?"
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr "Er standardud en terminal?"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr "Handling blev afbrudt før den kunne afsluttes"
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-"Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nået"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "afhængighedsproblemer - efterlader ukonfigureret"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en "
-"opfølgningsfejl fra en tidligere fejl."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Ingen apportrapport skrevet da fejlbeskeden indikerer en fuld disk-fejl"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok "
-"hukommelsesfejl"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Ingen apportrapport skrevet da fejlbeskeden indikerer en fejl på det lokale "
-"system"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr "Ingen apportrapport skrevet da fejlbeskeden indikerer en dpkg I/O-fejl"
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Kunne ikke låse administrationsmappen (%s), bruger en anden proces den?"
+msgid "%limin %lis"
+msgstr "%limin %lis"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Kunne ikke låse administrationsmappen (%s), er du rod (root)?"
+msgid "%lis"
+msgstr "%lis"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg blev afbrudt, du skal manuelt køre »%s« for at rette problemet."
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Ikke låst"
+msgid "Selection %s not found"
+msgstr "Det valgte %s blev ikke fundet"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3360,35 +3219,6 @@ msgstr "..."
msgid "%c%s... %u%%"
msgstr "%c%s... %u%%"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Det valgte %s blev ikke fundet"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Kan ikke udføre mmap for en tom fil"
@@ -3454,107 +3284,272 @@ msgstr "Kunne ikke finde monteringspunktet %s"
msgid "Failed to stat the cdrom"
msgstr "Kunne ikke finde cdrommen"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Ukendt type-forkortelse: »%c«"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Åbner konfigurationsfilen %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, 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:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaksfejl %s:%u: Forkert udformet mærke"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, 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:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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:881
+#: apt-pkg/contrib/configuration.cc:887
#, 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:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaksfejl %s:%u: Inkluderet herfra"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaksfejl %s:%u: Ikke-understøttet direktiv »%s«"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "Syntaksfejl %s:%u: ryd direktiv kræver et tilvalgstræ som argument"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, 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/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Kommandolinjetilvalget »%c« [fra %s] kendes ikke."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Kommandolinjetilvalget %s blev ikke forstået"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Kommandolinjetilvalget %s er ikke boolsk"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Tilvalget %s kræver et parameter."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Tilvalg %s: Opsætningspostens specifikation skal have en =<værdi>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, 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:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Tilvalget »%s« er for langt"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, 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:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Ugyldig handling %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Installerer %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Sætter %s op"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Fjerner %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "Fjerner %s helt"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Bemærker forsvinding af %s"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Kører førinstallationsudløser %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Mappe »%s« mangler"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Kunne ikke åbne filen »%s«"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Klargør %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Pakker %s ud"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Gør klar til at sætte %s op"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "Installerede %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Gør klar til afinstallation af %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "Fjernede %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Gør klar til at fjerne %s helt"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "Fjernede %s helt"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, c-format
+msgid "Can not write log (%s)"
+msgstr "Kan ikke skrive log (%s)"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr "Er /dev/pts monteret?"
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "Handling blev afbrudt før den kunne afsluttes"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+"Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nået"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "afhængighedsproblemer - efterlader ukonfigureret"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en "
+"opfølgningsfejl fra en tidligere fejl."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Ingen apportrapport skrevet da fejlbeskeden indikerer en fuld disk-fejl"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok "
+"hukommelsesfejl"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Ingen apportrapport skrevet da fejlbeskeden indikerer en fejl på det lokale "
+"system"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr "Ingen apportrapport skrevet da fejlbeskeden indikerer en dpkg I/O-fejl"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Kunne ikke låse administrationsmappen (%s), bruger en anden proces den?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Kunne ikke låse administrationsmappen (%s), er du rod (root)?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg blev afbrudt, du skal manuelt køre »%s« for at rette problemet."
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Ikke låst"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "DropNode kaldt med endnu forbundet knude"
@@ -3659,7 +3654,7 @@ msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler »%s«-elementet"
msgid "Internal error, could not locate member %s"
msgstr "Intern fejl, kunne ikke finde elementet %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Ikke-tolkbar kontrolfil"
@@ -3688,23 +3683,23 @@ msgstr "Arkivet er for kort"
msgid "Failed to read the archive headers"
msgstr "Kunne ikke læse arkivhovederne"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Kunne ikke oprette videreførsler"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Kunne ikke udføre gzip "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Ødelagt arkiv"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar-tjeksum fejlede, arkivet er ødelagt"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Ukendt TAR-hovedtype %u, element %s"
@@ -3721,6 +3716,9 @@ msgstr "Ukendt TAR-hovedtype %u, element %s"
#~ msgid "No keyring installed in %s."
#~ msgstr "Ingen nøglering installeret i %s."
+#~ msgid "Is stdout a terminal?"
+#~ msgstr "Er standardud en terminal?"
+
#~ msgid "ioctl(TIOCGWINSZ) failed"
#~ msgstr "ioctl(TIOCGWINSZ) mislykkedes"
diff --git a/po/de.po b/po/de.po
index 2eec382d2..d4ca0d5a0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.8\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2014-09-19 13:04+0100\n"
"Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
"Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -25,148 +25,148 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Paket %s Version %s hat eine unerfüllte Abhängigkeit:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Gesamtzahl an Paketnamen: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Gesamtzahl an Paketstrukturen: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " davon gewöhnliche Pakete: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " davon rein virtuelle Pakete: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " davon einzelne virtuelle Pakete: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " davon gemischte virtuelle Pakete: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " davon fehlend: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Gesamtzahl an unterschiedlichen Versionen: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Gesamtzahl an unterschiedlichen Beschreibungen: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Gesamtzahl an Abhängigkeiten: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Gesamtzahl an Version/Datei-Beziehungen: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Gesamtzahl an Beschreibung/Datei-Beziehungen: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Gesamtzahl an Bereitstellungen: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Gesamtzahl an Mustern: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Gesamtmenge an Slack: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Gesamtmenge an Speicher: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Paketdatei %s ist nicht synchronisiert."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Keine Pakete gefunden"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Sie müssen mindestens ein Suchmuster angeben"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
"Dieser Befehl ist überholt. Bitte verwenden Sie stattdessen »apt-mark "
"showauto«."
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Paket %s kann nicht gefunden werden."
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Paketdateien:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
"Zwischenspeicher ist nicht synchron, Querverweisen einer Paketdatei nicht "
"möglich"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Mit Pinning verwaltete Pakete:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(nicht gefunden)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Installiert: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Installationskandidat: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(keine)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Paket-Pinning: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Versionstabelle:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
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:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -237,24 +237,24 @@ msgstr ""
"Weitere Informationen finden Sie in den Handbuchseiten von apt-cache(8)\n"
"und apt.conf(5).\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
"Bitte geben Sie einen Namen für dieses Medium an, wie zum Beispiel »Debian "
"5.0.3 Disk 1«"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr ""
"Bitte legen Sie ein Medium in das Laufwerk ein und drücken Sie die "
"Eingabetaste (Enter)."
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "»%s« konnte nicht in »%s« eingebunden werden."
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -269,7 +269,7 @@ msgstr ""
"Einbindungspunkte\n"
"bekommen Sie mit »man apt-cdrom«."
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
"Wiederholen Sie dieses Prozedere für die restlichen Disks Ihres Satzes."
@@ -307,48 +307,48 @@ msgstr ""
" -c=? Diese Konfigurationsdatei lesen\n"
" -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Es kann kein Paket für Architektur »%s« gefunden werden"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Es kann kein Paket »%s« mit Version »%s« gefunden werden"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Es kann kein Paket »%s« in der Veröffentlichung »%s« gefunden werden"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Als Quellpaket wird »%s« statt »%s« gewählt.\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Es kann keine Version »%s« des Pakets »%s« gefunden werden"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Paket %s konnte nicht gefunden werden"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s wurde als manuell installiert festgelegt.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s wurde als automatisch installiert festgelegt.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -356,31 +356,26 @@ msgstr ""
"Dieser Befehl ist überholt. Bitte verwenden Sie stattdessen »apt-mark auto« "
"und »apt-mark manual«."
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Interner Fehler, der Problemlöser hat etwas beschädigt."
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Das Verzeichnis %s kann nicht gesperrt werden."
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden."
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
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:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Quellpaket für %s kann nicht gefunden werden."
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -390,7 +385,7 @@ msgstr ""
"auf:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -402,69 +397,69 @@ msgstr ""
"um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n"
"für das Paket abzurufen.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Quelle %s wird heruntergeladen.\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Einige Archive konnten nicht heruntergeladen werden."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Das Entpacken der bereits entpackten Quelle in %s wird übersprungen.\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Entpackbefehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Kindprozess fehlgeschlagen"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Es muss mindestens ein Paket angegeben werden, dessen Bauabhängigkeiten "
"überprüft werden sollen."
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -473,28 +468,28 @@ msgstr ""
"Keine Architekturinformation für %s verfügbar. Weiteres zur Einrichtung "
"finden Sie unter apt.conf(5) APT::Architectures."
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Informationen zu Bauabhängigkeiten für %s konnten nicht gefunden werden."
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s hat keine Bauabhängigkeiten.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -503,7 +498,7 @@ msgstr ""
"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da %s bei »%s«-Paketen "
"nicht erlaubt ist."
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -512,14 +507,14 @@ msgstr ""
"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht "
"gefunden werden kann."
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"»%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %s "
"ist zu neu."
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -529,7 +524,7 @@ msgstr ""
"Installationskandidaten für das Paket %s die Versionsanforderungen nicht "
"erfüllen kann."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -538,17 +533,17 @@ msgstr ""
"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da für Paket %s kein "
"Installationskandidat existiert."
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "»%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bauabhängigkeiten für %s konnten nicht erfüllt werden."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen"
@@ -664,11 +659,11 @@ msgstr "Eine URL als Argument wird benötigt"
msgid "Must specify at least one pair url/filename"
msgstr "Es muss mindestens ein URL/Dateinamen-Paar angegeben werden"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr "Herunterladen fehlgeschlagen"
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -692,53 +687,54 @@ msgstr ""
"\n"
" Dieses APT-Hilfsprogramm hat Super-Road-Runner-Kräfte.\n"
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr ""
"Markierung für %s kann nicht gesetzt werden, da es nicht installiert ist.\n"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s wurde bereits auf manuell installiert gesetzt.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s wurde bereits auf automatisch installiert gesetzt.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr "%s wurde bereits auf Halten gesetzt.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr "Die Halten-Markierung für %s wurde bereits entfernt.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr "%s auf Halten gesetzt.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "Halten-Markierung für %s entfernt.\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr "Ausführen von dpkg fehlgeschlagen. Sind Sie root?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -1009,7 +1005,7 @@ msgstr "Zeitüberschreitung bei Datenverbindungsaufbau"
msgid "Unable to accept connection"
msgstr "Verbindung konnte nicht angenommen werden."
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Problem bei Bestimmung des Hashwertes einer Datei"
@@ -1100,25 +1096,25 @@ msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)."
msgid "Unable to connect to %s:%s:"
msgstr "Verbindung mit %s:%s nicht möglich:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Interner Fehler: Gültige Signatur, Fingerabdruck des Schlüssels konnte "
"jedoch nicht ermittelt werden?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Mindestens eine ungültige Signatur wurde entdeckt."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"»apt-key« konnte zur Überprüfung der Signatur nicht ausgeführt werden (ist "
"gnupg installiert?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1127,15 +1123,15 @@ msgstr ""
"Durch Clearsign signierte Datei ist nicht gültig, »%s« erhalten (erfordert "
"das Netzwerk eine Authentifizierung?)"
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Unbekannter Fehler beim Ausführen von apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Die folgenden Signaturen waren ungültig:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1148,33 +1144,33 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr "Leere Dateien können kein gültiges Archiv sein."
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Fehler beim Schreiben der Datei"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Fehler beim Lesen vom Server: Verbindung wurde durch den Server auf der "
"anderen Seite geschlossen."
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Fehler beim Lesen vom Server"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Fehler beim Schreiben in Datei"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Auswahl fehlgeschlagen"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Zeitüberschreitung bei Verbindung"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Fehler beim Schreiben der Ausgabedatei"
@@ -1182,56 +1178,312 @@ msgstr "Fehler beim Schreiben der Ausgabedatei"
msgid "Waiting for headers"
msgstr "Warten auf Kopfzeilen"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Ungültige Kopfzeile"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "Vom HTTP-Server wurde eine ungültige Antwort-Kopfzeile gesandt."
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
"Vom HTTP-Server wurde eine ungültige »Content-Length«-Kopfzeile gesandt."
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
"Vom HTTP-Server wurde eine ungültige »Content-Range«-Kopfzeile gesandt."
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr ""
"Teilweise Dateiübertragung wird vom HTTP-Server nur fehlerhaft unterstützt."
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Unbekanntes Datumsformat"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Fehlerhafte Kopfzeilendaten"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Verbindung fehlgeschlagen"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Interner Fehler"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Auflistung"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+"Es gibt %i zusätzliche Version. Bitte verwenden Sie die Option »-a«, um sie "
+"anzuzeigen."
+msgstr[1] ""
+"Es gibt %i zusätzliche Versionen. Bitte verwenden Sie die Option »-a«, um "
+"sie anzuzeigen."
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Abhängigkeiten werden korrigiert ..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " fehlgeschlagen."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Abhängigkeiten konnten nicht korrigiert werden."
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden."
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Fertig"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Unerfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "unbekannt"
+
+#: apt-private/private-output.cc:265
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installiert,aktualisierbar auf: %s]"
+
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr " [Installiert,lokal]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[installiert,automatisch-entfernbar]"
+
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr " [Installiert,automatisch]"
+
+#: apt-private/private-output.cc:274
+msgid "[installed]"
+msgstr " [installiert]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[aktualisierbar von: %s]"
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr "[Konfiguration-verbleibend]"
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "aber %s ist installiert"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "aber %s soll installiert werden"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "ist aber nicht installierbar"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "ist aber ein virtuelles Paket"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "ist aber nicht installiert"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "soll aber nicht installiert werden"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " oder"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Die folgenden NEUEN Pakete werden installiert:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Die folgenden Pakete werden ENTFERNT:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Die folgenden Pakete sind zurückgehalten worden:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr ""
+"Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (wegen %s) "
+
+#: apt-private/private-output.cc:696
+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, außer Sie wissen genau, was Sie tun!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aktualisiert, %lu neu installiert, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu erneut installiert, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu durch eine ältere Version ersetzt, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nicht vollständig installiert oder entfernt.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Der Befehl »update« akzeptiert keine Argumente."
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"Aktualisierung für %i Paket verfügbar. Führen Sie »apt list --upgradable« "
+"aus, um es anzuzeigen.\n"
+msgstr[1] ""
+"Aktualisierung für %i Pakete verfügbar. Führen Sie »apt list --upgradable« "
+"aus, um sie anzuzeigen.\n"
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr "Alle Pakete sind aktuell."
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "Sortierung"
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+"Es gibt %i zusätzlichen Eintrag. Bitte verwenden Sie die Option »-a«, um ihn "
+"anzuzeigen."
+msgstr[1] ""
+"Es gibt %i zusätzliche Einträge. Bitte verwenden Sie die Option »-a«, um sie "
+"anzuzeigen."
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "kein reales Paket (virtuell)"
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"HINWEIS: Dies ist nur eine Simulation!\n"
+" apt-get benötigt root-Privilegien für die reale Ausführung.\n"
+" Behalten Sie ebenfalls in Hinterkopf, dass die Sperren deaktiviert\n"
+" sind, verlassen Sie sich also bezüglich des reellen aktuellen\n"
+" Status der Sperre nicht darauf!"
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!"
@@ -1504,262 +1756,6 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Paket »%s« ist nicht installiert, wird also auch nicht entfernt.\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "Auflistung"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-"Es gibt %i zusätzliche Version. Bitte verwenden Sie die Option »-a«, um sie "
-"anzuzeigen."
-msgstr[1] ""
-"Es gibt %i zusätzliche Versionen. Bitte verwenden Sie die Option »-a«, um "
-"sie anzuzeigen."
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Abhängigkeiten werden korrigiert ..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " fehlgeschlagen."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Abhängigkeiten konnten nicht korrigiert werden."
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden."
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Fertig"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Unerfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "unbekannt"
-
-#: apt-private/private-output.cc:265
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installiert,aktualisierbar auf: %s]"
-
-#: apt-private/private-output.cc:268
-msgid "[installed,local]"
-msgstr " [Installiert,lokal]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr "[installiert,automatisch-entfernbar]"
-
-#: apt-private/private-output.cc:272
-msgid "[installed,automatic]"
-msgstr " [Installiert,automatisch]"
-
-#: apt-private/private-output.cc:274
-msgid "[installed]"
-msgstr " [installiert]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[aktualisierbar von: %s]"
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr "[Konfiguration-verbleibend]"
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "aber %s ist installiert"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "aber %s soll installiert werden"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "ist aber nicht installierbar"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "ist aber ein virtuelles Paket"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "ist aber nicht installiert"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "soll aber nicht installiert werden"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " oder"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Die folgenden Pakete haben unerfüllte Abhängigkeiten:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Die folgenden NEUEN Pakete werden installiert:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Die folgenden Pakete werden ENTFERNT:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Die folgenden Pakete sind zurückgehalten worden:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-"Die folgenden Pakete werden durch eine ÄLTERE VERSION ERSETZT (Downgrade):"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Die folgenden zurückgehaltenen Pakete werden verändert:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (wegen %s) "
-
-#: apt-private/private-output.cc:696
-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, außer Sie wissen genau, was Sie tun!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aktualisiert, %lu neu installiert, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu erneut installiert, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu durch eine ältere Version ersetzt, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nicht vollständig installiert oder entfernt.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Der Befehl »update« akzeptiert keine Argumente."
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"Aktualisierung für %i Paket verfügbar. Führen Sie »apt list --upgradable« "
-"aus, um es anzuzeigen.\n"
-msgstr[1] ""
-"Aktualisierung für %i Pakete verfügbar. Führen Sie »apt list --upgradable« "
-"aus, um sie anzuzeigen.\n"
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr "Alle Pakete sind aktuell."
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-"Es gibt %i zusätzlichen Eintrag. Bitte verwenden Sie die Option »-a«, um ihn "
-"anzuzeigen."
-msgstr[1] ""
-"Es gibt %i zusätzliche Einträge. Bitte verwenden Sie die Option »-a«, um sie "
-"anzuzeigen."
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "kein reales Paket (virtuell)"
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"HINWEIS: Dies ist nur eine Simulation!\n"
-" apt-get benötigt root-Privilegien für die reale Ausführung.\n"
-" Behalten Sie ebenfalls in Hinterkopf, dass die Sperren deaktiviert\n"
-" sind, verlassen Sie sich also bezüglich des reellen aktuellen\n"
-" Status der Sperre nicht darauf!"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1814,20 +1810,24 @@ msgid "Full Text Search"
msgstr "Volltextsuche"
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "OK "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "OK:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Holen: "
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Holen:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ign:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Fehl "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Fehl:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1853,17 +1853,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "%s kann nicht gelesen werden."
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1940,7 +1940,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Verfügbare Informationen werden zusammengeführt."
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1964,47 +1964,47 @@ msgstr ""
" -c=? Diese Konfigurationsdatei lesen\n"
" -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, c-format
msgid "Unable to mkstemp %s"
msgstr "mkstemp %s nicht möglich"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Schreiben nach %s nicht möglich"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
"Debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Paketerweiterungsliste ist zu lang."
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Fehler beim Verarbeiten von Verzeichnis %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Quellerweiterungsliste ist zu lang."
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Fehler beim Schreiben der Kopfzeilen in die Inhaltsdatei"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Fehler beim Verarbeiten der Inhalte %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -2091,11 +2091,11 @@ msgstr ""
" -c=? diese Konfigurationsdatei lesen\n"
" -o=? eine beliebige Konfigurationsoption setzen"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Keine Auswahl traf zu"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«."
@@ -2207,22 +2207,22 @@ msgstr " DeLink-Limit von %sB erreicht\n"
msgid "Archive had no package field"
msgstr "Archiv hatte kein Feld »package«"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s hat keinen Eintrag in der Override-Liste.\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-Betreuer ist %s und nicht %s.\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n"
@@ -2308,7 +2308,7 @@ msgstr "Problem beim Entfernen (unlink) von %s"
msgid "Failed to rename %s to %s"
msgstr "%s konnte nicht in %s umbenannt werden."
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2333,11 +2333,11 @@ msgstr ""
" -c=? Diese Konfigurationsdatei benutzen\n"
" -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Unbekannter Paketeintrag!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2412,6 +2412,28 @@ msgstr "Authentifizierungs-Datensatz konnte nicht gefunden werden für: %s"
msgid "Hash mismatch for: %s"
msgstr "Hash-Summe stimmt nicht überein für: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, 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:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "Ist das Paket %s installiert?"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Methode %s ist nicht korrekt gestartet."
+
+#: apt-pkg/acquire-worker.cc:485
+#, 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« ein und "
+"drücken Sie die Eingabetaste (Enter)."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2426,178 +2448,308 @@ msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren."
msgid "The list of sources could not be read."
msgstr "Die Liste der Quellen konnte nicht gelesen werden."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Leerer Paketzwischenspeicher"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Die Paketzwischenspeicher-Datei ist beschädigt."
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr ""
"Die Paketzwischenspeicher-Datei liegt in einer inkompatiblen Version vor."
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr "Die Paketzwischenspeicher-Datei ist beschädigt, sie ist zu klein."
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Das Versionssystem »%s« wird durch dieses APT nicht unterstützt."
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Der Paketzwischenspeicher wurde für eine andere Architektur aufgebaut."
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Hängt ab von"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Hängt ab von (vorher)"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Schlägt vor"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Empfiehlt"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Kollidiert mit"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Ersetzt"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Löst ab"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Beschädigt"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Wertet auf"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "wichtig"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "erforderlich"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "optional"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "extra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Paketaktualisierung (Upgrade) wird berechnet"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Der Treiber für Methode %s konnte nicht gefunden werden."
+msgid "Index file type '%s' is not supported"
+msgstr "Indexdateityp »%s« wird nicht unterstützt."
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, c-format
-msgid "Is the package %s installed?"
-msgstr "Ist das Paket %s installiert?"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Missgestalteter Absatz %u in Quellliste %s (»URI parse«)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Methode %s ist nicht korrekt gestartet."
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] nicht auswertbar)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] zu kurz)"
+
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] ist keine Zuweisung)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] hat keinen Schlüssel)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-"Bitte legen Sie das Medium mit dem Namen »%s« in Laufwerk »%s« ein und "
-"drücken Sie die Eingabetaste (Enter)."
+"Missgestaltete Zeile %lu in Quellliste %s ([%s] Schlüssel %s hat keinen Wert)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:206
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexdateityp »%s« wird nicht unterstützt."
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Abhängigkeitsbaum wird aufgebaut."
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)"
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Installationskandidat-Versionen"
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Abhängigkeitsgenerierung"
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Statusinformationen werden eingelesen."
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s wird geöffnet."
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "StateFile %s konnte nicht geöffnet werden."
+msgid "Line %u too long in source list %s."
+msgstr "Zeile %u in Quellliste %s zu lang."
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:371
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Temporäres StateFile %s konnte nicht geschrieben werden."
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt."
+
+#: apt-pkg/sourcelist.cc:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ »%s« ist in Absatz %u der Quellliste %s ist unbekannt."
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr "Leeren von %s wird nicht unterstützt."
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s mit stat abfragen nicht möglich"
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Zwischenspeicher hat ein inkompatibles Versionssystem."
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Fehler aufgetreten beim Verarbeiten von %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Na so was, Sie haben die Anzahl an Paketen überschritten, mit denen diese "
+"APT-Version umgehen kann."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"Na so was, Sie haben die Anzahl an Versionen überschritten, mit denen diese "
+"APT-Version umgehen kann."
+
+#: apt-pkg/pkgcachegen.cc:279
+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 "
+"diese APT-Version umgehen kann."
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Na so was, Sie haben die Anzahl an Abhängigkeiten überschritten, mit denen "
+"diese APT-Version umgehen kann."
+
+#: apt-pkg/pkgcachegen.cc:591
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+"Paket %s %s wurde beim Verarbeiten der Dateiabhängigkeiten nicht gefunden."
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Die Quellpaket-Liste %s konnte nicht mit »stat« abgefragt werden"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Paketlisten werden gelesen"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Szenario an Problemlöser senden"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Anfrage an Problemlöser senden"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Vorbereiten, eine Lösung zu erhalten"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen."
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "Externen Problemlöser ausführen"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Hash-Summe stimmt nicht überein"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Größe stimmt nicht überein"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
msgid "Invalid file format"
msgstr "Ungültiges Dateiformat"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Schreibfehler"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
#, fuzzy
msgid "Does not start with a cleartext signature"
msgstr "Datei %s beginnt nicht mit einer Klartext-signierten Nachricht."
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2608,7 +2760,7 @@ msgstr ""
"GPG-Fehler: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-Fehler: %s: %s"
@@ -2624,14 +2776,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2640,17 +2792,17 @@ msgstr ""
"Erwarteter Eintrag »%s« konnte in Release-Datei nicht gefunden werden "
"(falscher Eintrag in sources.list oder missgebildete Datei)."
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Hash-Summe für »%s« kann in Release-Datei nicht gefunden werden."
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
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:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2659,19 +2811,19 @@ msgstr ""
"Release-Datei für %s ist abgelaufen (ungültig seit %s). Aktualisierungen für "
"dieses Depot werden nicht angewendet."
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2681,137 +2833,58 @@ msgstr ""
"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
"Architektur)."
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
"Es konnte keine Quelle gefunden werden, um Version »%s« von »%s« "
"herunterzuladen."
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Zwischenspeicher hat ein inkompatibles Versionssystem."
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Fehler aufgetreten beim Verarbeiten von %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Na so was, Sie haben die Anzahl an Paketen überschritten, mit denen diese "
-"APT-Version umgehen kann."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Na so was, Sie haben die Anzahl an Versionen überschritten, mit denen diese "
-"APT-Version umgehen kann."
-
-#: apt-pkg/pkgcachegen.cc:279
-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 "
-"diese APT-Version umgehen kann."
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Na so was, Sie haben die Anzahl an Abhängigkeiten überschritten, mit denen "
-"diese APT-Version umgehen kann."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-"Paket %s %s wurde beim Verarbeiten der Dateiabhängigkeiten nicht gefunden."
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Die Quellpaket-Liste %s konnte nicht mit »stat« abgefragt werden"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Paketlisten werden gelesen"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Herstellerblock %s enthält keinen Fingerabdruck."
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Listenverzeichnis %spartial fehlt."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Archivverzeichnis %spartial fehlt."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, c-format
-msgid "Clean of %s is not supported"
-msgstr "Leeren von %s wird nicht unterstützt."
+msgid "Unable to lock directory %s"
+msgstr "Das Verzeichnis %s kann nicht gesperrt werden."
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Holen der Datei %li von %li (noch %s)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Holen der Datei %li von %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-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/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
"Sie müssen einige »source«-URIs für Quellpakete in die sources.list-Datei "
"eintragen."
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s mit stat abfragen nicht möglich"
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2836,7 +2909,7 @@ msgstr "Pinning-Typ %s kann nicht interpretiert werden."
msgid "No priority (or zero) specified for pin"
msgstr "Keine Priorität (oder Null) für Pin angegeben"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2845,12 +2918,12 @@ msgstr ""
"»%s« konnte nicht unmittelbar konfiguriert werden. Lesen Sie »man 5 apt."
"conf« unter APT::Immediate-Configure bezüglich weiterer Details. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr "»%s« konnte nicht konfiguriert werden. "
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2862,10 +2935,13 @@ msgstr ""
"ist oft schlimm, aber wenn Sie es wirklich tun wollen, aktivieren Sie bitte "
"die Option APT::Force-LoopBreak."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Zeile %u in Quellliste %s zu lang."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+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/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2936,11 +3012,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Kopieren der Paketlisten ..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Schreiben der neuen Quellliste\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Quelllisteneinträge für dieses Medium sind:\n"
@@ -2952,7 +3028,7 @@ msgstr ""
"Das Paket %s muss neu installiert werden, es kann jedoch kein Archiv dafür "
"gefunden werden."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2960,143 +3036,42 @@ msgstr ""
"Fehler: Unterbrechungen durch pkgProblemResolver::Resolve hervorgerufen; "
"dies könnte durch zurückgehaltene Pakete verursacht worden sein."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Probleme können nicht korrigiert werden, Sie haben zurückgehaltene defekte "
"Pakete."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "Szenario an Problemlöser senden"
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr "Anfrage an Problemlöser senden"
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr "Vorbereiten, eine Lösung zu erhalten"
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Externer Problemlöser ist ohne ordnungsgemäße Fehlermeldung fehlgeschlagen."
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr "Externen Problemlöser ausführen"
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)."
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)."
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Release-Datei %s kann nicht verarbeitet werden."
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Keine Bereiche (Sections) in Release-Datei %s"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Kein Hash-Eintrag in Release-Datei %s"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ungültiger »Valid-Until«-Eintrag in Release-Datei %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Missgestalteter Absatz %u in Quellliste %s (»URI parse«)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] nicht auswertbar)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s ([Option] zu kurz)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] ist keine Zuweisung)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s ([%s] hat keinen Schlüssel)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Missgestaltete Zeile %lu in Quellliste %s ([%s] Schlüssel %s hat keinen Wert)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)"
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Abhängigkeitsbaum wird aufgebaut."
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Installationskandidat-Versionen"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Abhängigkeitsgenerierung"
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "%s wird geöffnet."
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Statusinformationen werden eingelesen."
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
+msgid "Failed to open StateFile %s"
+msgstr "StateFile %s konnte nicht geöffnet werden."
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt."
+msgid "Failed to write temporary StateFile %s"
+msgstr "Temporäres StateFile %s konnte nicht geschrieben werden."
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typ »%s« ist in Absatz %u der Quellliste %s ist unbekannt."
+msgid "Unable to parse package file %s (%d)"
+msgstr "Paketdatei %s konnte nicht verarbeitet werden (%d)."
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -3108,50 +3083,50 @@ msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden."
msgid "Version '%s' for '%s' was not found"
msgstr "Version »%s« für »%s« konnte nicht gefunden werden."
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Task »%s« konnte nicht gefunden werden."
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Mittels des Musters »%s« konnte kein Paket gefunden werden."
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Es können keine Versionen von Paket »%s« ausgewählt werden, da es rein "
"virtuell ist."
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Die neueste Version von Paket »%s« kann nicht ausgewählt werden, da es rein "
"virtuell ist."
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Es kann kein Installationskandidat von Paket »%s« ausgewählt werden, da kein "
"solcher existiert."
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Die installierte Version von Paket »%s« kann nicht ausgewählt werden, da es "
"nicht installiert ist."
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3160,183 +3135,59 @@ msgstr ""
"Es kann weder eine installierte Version noch ein Installationskandidat von "
"Paket »%s« ausgewählt werden, da beide nicht existieren."
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "%s wird installiert."
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "%s wird konfiguriert."
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "%s wird entfernt."
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "%s wird vollständig entfernt."
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Verschwinden von %s festgestellt"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Aufruf des Nach-Installations-Triggers %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Verzeichnis »%s« fehlt"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Datei »%s« konnte nicht geöffnet werden."
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "%s wird vorbereitet."
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "%s wird entpackt."
-
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Preparing to configure %s"
-msgstr "Konfiguration von %s wird vorbereitet."
+msgid "Unable to parse Release file %s"
+msgstr "Release-Datei %s kann nicht verarbeitet werden."
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Installed %s"
-msgstr "%s installiert"
+msgid "No sections in Release file %s"
+msgstr "Keine Bereiche (Sections) in Release-Datei %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Entfernen von %s wird vorbereitet."
+msgid "No Hash entry in Release file %s"
+msgstr "Kein Hash-Eintrag in Release-Datei %s"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Removed %s"
-msgstr "%s entfernt"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ungültiger »Valid-Until«-Eintrag in Release-Datei %s"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Vollständiges Entfernen von %s wird vorbereitet."
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Completely removed %s"
-msgstr "%s vollständig entfernt"
+msgid "%lid %lih %limin %lis"
+msgstr "%li d %li h %li min %li s"
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Can not write log (%s)"
-msgstr "Schreiben des Protokolls nicht möglich (%s)"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr "Ist /dev/pts eingebunden?"
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr "Ist stdout ein Terminal?"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte."
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-"Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits "
-"erreicht ist."
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung darauf "
-"hindeutet, dass dies lediglich ein Folgefehler eines vorherigen Problems ist."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
-"wegen voller Festplatte hindeutet."
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
-"wegen erschöpftem Arbeitsspeicher hindeutet."
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
-"im lokalen System hindeutet."
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Ein-/"
-"Ausgabe-Fehler von Dpkg hindeutet."
+msgid "%lih %limin %lis"
+msgstr "%li h %li min %li s"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Sperren des Administrationsverzeichnisses (%s) nicht möglich, wird es von "
-"einem anderen Prozess verwendet?"
+msgid "%limin %lis"
+msgstr "%li min %li s"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Sperren des Administrationsverzeichnisses (%s) nicht möglich, sind Sie root?"
+msgid "%lis"
+msgstr "%li s"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"Der dpkg-Prozess wurde unterbrochen; Sie müssen manuell »%s« ausführen, um "
-"das Problem zu beheben."
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Nicht gesperrt"
+msgid "Selection %s not found"
+msgstr "Auswahl %s nicht gefunden"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3480,35 +3331,6 @@ msgstr "..."
msgid "%c%s... %u%%"
msgstr "%c%s... %u%%"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li d %li h %li min %li s"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li h %li min %li s"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%li min %li s"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%li s"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Auswahl %s nicht gefunden"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Eine leere Datei kann nicht mit mmap abgebildet werden."
@@ -3574,110 +3396,283 @@ msgstr "Einbindungspunkt %s mit »stat« abfragen nicht möglich."
msgid "Failed to stat the cdrom"
msgstr "CD-ROM mit »stat« abfragen fehlgeschlagen"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Nicht erkannte Typabkürzung: »%c«"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Konfigurationsdatei %s wird geöffnet"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaxfehler %s:%u: Block beginnt ohne Namen."
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaxfehler %s:%u: Missgestaltete Markierung"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaxfehler %s:%u: Zusätzlicher Unsinn nach Wert"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaxfehler %s:%u: Zu viele verschachtelte Einbindungen (includes)"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaxfehler %s:%u: Eingefügt von hier"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive »%s«"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Syntaxfehler %s:%u: Löschdirektiven benötigen einen Optionsbaum als Argument"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaxfehler %s:%u: Zusätzlicher Unsinn am Dateiende"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Befehlszeilenoption »%c« [aus %s] ist nicht bekannt."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Befehlszeilenoption %s konnte nicht ausgewertet werden."
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Befehlszeilenoption %s ist nicht Bool'sch."
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Option %s erfordert ein Argument."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Option %s: Konfigurationswertspezifikation benötigt ein »=<Wert>«."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht »%s«."
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Option »%s« ist zu lang."
# Check for boolean; -1 is unspecified, 0 is yes 1 is no
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, 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«."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Ungültige Operation %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "%s wird installiert."
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "%s wird konfiguriert."
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "%s wird entfernt."
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "%s wird vollständig entfernt."
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Verschwinden von %s festgestellt"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Aufruf des Nach-Installations-Triggers %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Verzeichnis »%s« fehlt"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Datei »%s« konnte nicht geöffnet werden."
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "%s wird vorbereitet."
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "%s wird entpackt."
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Konfiguration von %s wird vorbereitet."
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "%s installiert"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Entfernen von %s wird vorbereitet."
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "%s entfernt"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Vollständiges Entfernen von %s wird vorbereitet."
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s vollständig entfernt"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, c-format
+msgid "Can not write log (%s)"
+msgstr "Schreiben des Protokolls nicht möglich (%s)"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr "Ist /dev/pts eingebunden?"
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte."
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+"Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits "
+"erreicht ist."
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "Abhängigkeitsprobleme - verbleibt unkonfiguriert"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung darauf "
+"hindeutet, dass dies lediglich ein Folgefehler eines vorherigen Problems ist."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
+"wegen voller Festplatte hindeutet."
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
+"wegen erschöpftem Arbeitsspeicher hindeutet."
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
+"im lokalen System hindeutet."
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Ein-/"
+"Ausgabe-Fehler von Dpkg hindeutet."
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Sperren des Administrationsverzeichnisses (%s) nicht möglich, wird es von "
+"einem anderen Prozess verwendet?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+"Sperren des Administrationsverzeichnisses (%s) nicht möglich, sind Sie root?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"Der dpkg-Prozess wurde unterbrochen; Sie müssen manuell »%s« ausführen, um "
+"das Problem zu beheben."
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Nicht gesperrt"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "»DropNode« auf noch verknüpften Knoten aufgerufen"
@@ -3782,7 +3777,7 @@ msgstr "Dies ist kein gültiges DEB-Archiv, da es »%s« nicht enthält."
msgid "Internal error, could not locate member %s"
msgstr "Interner Fehler, Bestandteil %s konnte nicht gefunden werden"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Auswerten der »control«-Datei nicht möglich"
@@ -3811,23 +3806,23 @@ msgstr "Archiv ist zu kurz."
msgid "Failed to read the archive headers"
msgstr "Archiv-Kopfzeilen konnten nicht gelesen werden."
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Pipes (Weiterleitungen) konnten nicht erzeugt werden."
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "gzip konnte nicht ausgeführt werden."
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Beschädigtes Archiv"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv beschädigt"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Unbekannter Tar-Kopfzeilen-Typ %u, Bestandteil %s"
@@ -3844,6 +3839,9 @@ msgstr "Unbekannter Tar-Kopfzeilen-Typ %u, Bestandteil %s"
#~ msgid "No keyring installed in %s."
#~ msgstr "Kein Schlüsselring in %s installiert"
+#~ msgid "Is stdout a terminal?"
+#~ msgstr "Ist stdout ein Terminal?"
+
#~ msgid "ioctl(TIOCGWINSZ) failed"
#~ msgstr "ioctl(TIOCGWINSZ) fehlgeschlagen"
diff --git a/po/dz.po b/po/dz.po
index ed74e4400..a4c50d245 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2006-09-19 09:49+0530\n"
"Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
"Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -24,149 +24,149 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "ཐུམ་སྒྲིལ་ %s ཐོན་རིམ་ %s ལུ་ ཌེཔ་མ་ཚང་ཅིག་འདུག:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "ཐུམ་སྒྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ:"
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid "Total package structures: "
msgstr "ཐུམ་སྒྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ:"
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr "སྤྱིར་བཏང་ཐུམ་སྒྲིལ་ཚུ།"
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་གཙང་མ་ཚུ:"
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་རྐྱང་པ་ཚུ:"
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་སླ་བསྲེ་ཡོད་མི་ཚུ:"
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr "བརླག་སྟོར་ཞུགས་པ:"
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས:"
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
#, fuzzy
msgid "Total distinct descriptions: "
msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས:"
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "རྟེན་འབྲེལ་བསྡོམས:"
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས:"
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
#, fuzzy
msgid "Total Desc/File relations: "
msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས:"
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "ཡོངས་བསྡོམས་ཀྱིས་ས་ཁྲ་བཟོ་བ་ཚུ་བྱིནམ་ཨིན:"
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "སྤུངས་ཡོད་པའི་ཡིག་རྒྱུན་གྱི་བསྡོམས:"
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "བར་སྟོང་ལྷུག་ལྷུག་གི་བསྡོམས:"
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "གི་དོན་ལུ་རྩིས་ཐོ་བཏོན་ཡོད་པའི་བར་སྟོང:"
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "ཐུམ་སྒྲིལ་ཡིག་སྣོད་ %sའདི་མཉམ་འབྱུང་གི་ཕྱི་ཁར་ཨིན་པས།"
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "ཐུམ་སྒྲིལ་ཚུ་མ་ཐོབ།"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
#, fuzzy
msgid "You must give at least one search pattern"
msgstr "ཁྱོད་ཀྱིས་ཏག་ཏག་སྦེ་དཔེ་གཞི་གཅིག་བྱིན་དགོ"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "%sཐུམ་སྒྲིལ་འདི་ག་ཡོད་ཟཚོལ་མ་ཐོབ།"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
"འདྲ་མཛོད་འདི་མཉམ་བྱུང་གི་ཕྱི་ཁར་ཨིན་པས་ ཐུམ་སྒྲིལ་ཡིག་སྣོད་ཅིག་ལུ་ ཨེགསི་-རེཕ་འབད་མི་ཚུགས་པས།"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "ཁབ་གཟེར་བཏབ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(མ་ཐོབ།)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr "གཞི་བཙུགས་འབད་ཡོདཔ།"
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr "མི་ངོ:"
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(ཅི་མེད།)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr "ཐུམ་སྒྲིལ་གྱི་ཁབ་གཟེར:"
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, 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:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -241,21 +241,21 @@ msgstr ""
"cache=/tmp\n"
" ཧེང་བཀལ་བརྡ་དོན་གི་དོན་ལུ་ ཨེ་apt-cache(8)དང་apt.conf(5)ལག་ཐོག་ཤོག་ལེབ་ཚུ་བལྟ།.\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "ཌིསིཀ་འདི་གི་དོན་ལུ་མིང་ཅིག་བླིན་གནང་ དཔེར་ན་ 'Debian 2.1r1 Disk 1'བཟུམ།"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "ཌིསིཀ་ཅིག་འདྲེན་འཕྲུལ་ནང་བཙུགས་བཞིནམ་ལས་ལོག་ལྡེ་འདི་ཨེབ།"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -263,7 +263,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "ཁྱོད་ཀྱི་ཆ་ཚན་ནང་གི་སི་ཌི་ལྷག་ལུས་ཡོད་མི་གི་དོན་ལུ་འ་ནི་ལས་སྦྱོར་དེ་ཡང་བསྐྱར་འབད།"
@@ -299,83 +299,78 @@ msgstr ""
" -c=? འདི་གིས་འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
" -o=? མཐུན་སྒྲིག་གི་རིམ་སྒྲིག་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་བཟུམ།\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -383,115 +378,115 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB་ལེན་དགོཔ་འདུག་ འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "%s་འབྱུང་ཁུངས་ལེན།\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, 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:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་"
"སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -500,24 +495,24 @@ msgstr ""
"%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་"
"ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།"
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
@@ -628,11 +623,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -646,52 +641,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -913,7 +909,7 @@ msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ན
msgid "Unable to accept connection"
msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།"
@@ -1002,40 +998,41 @@ msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་
msgid "Unable to connect to %s:%s:"
msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་ འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་"
"མ་ཚུགས?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
#, fuzzy
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
-"མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)"
+"མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gnupg་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་"
+"ན།?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "apt-key་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1046,31 +1043,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
@@ -1078,53 +1075,294 @@ msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འ
msgid "Waiting for headers"
msgstr "མགོ་ཡིག་ཚུ་གི་དོན་ལུ་བསྒ྄ག་དོ།"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "མགོ་ཡིག་གི་གྲལ་ཐིག་བྱང་ཉེས།"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ནུས་མེད་ལན་གསལ་གི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "ཨེཆི་ཊི་ཊི་པི་སར་བར་འདི་གིས་ནུས་མེད་ནང་དོན་རིང་-ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ནུས་མེད་ ནང་དོན་-ཁྱབ་ཚད་ཀྱི་མགོ་ཡིག་ཅིག་བཏང་ཡོད།"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བར་འདི་གིས་ ཁྱབ་ཚད་ཀྱི་རྒྱབ་སྐྱོར་དེ་ཆད་པ་བཟོ་བཏང་ནུག"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "ནང་འཁོད་འཛོལ་བ།"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།"
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr "འབད་ཚར་ཡི།"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -f ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།"
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr "ཡང་ན།"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s( %s་གིས་སྦེ)"
+
+#: apt-private/private-output.cc:696
+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"
+"ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།"
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།"
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།"
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "ཝའི།"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1382,247 +1620,6 @@ msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུག
msgid "Package '%s' is not installed, so not removed\n"
msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་ འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་དོ།"
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "རྟེན་འབྲེལ་འདི་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་ཚན་འདི་ཆུང་ཀུ་བཟོ་མི་ཚུགས་པས།"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr "འབད་ཚར་ཡི།"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "འ་ནི་འདི་ཚུ་ནོར་བཅོས་འབད་ནི་ལུ་ཁྱོད་ཀྱི་'apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་།"
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། -f ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།"
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "འདི་འབདཝ་ད་%s་འདི་གཞི་བཙུགས་འབད་ཡོད།"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "འདི་འབདཝ་ད་%s་འདི་གཟི་བཙུགས་འབད་མི་བཏུབ་པས།"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "འདི་འབདཝ་ད་ འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན་པས།"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མི་འབད་ནི་ཨིན་པས།"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr "ཡང་ན།"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཚུ་ལུ་རྟེན་འབྲེལ་མ་ཚང་པས:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་རྩ བསྐྲད་གཏང་འོང་:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ལོག་སྟེ་རང་བཞག་ནུག:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "འོག་གི་ཐུམ་སྒྲིལ་འདི་ཚུ་ཡར་བསྐྱེད་འབད་འོང་:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "འོག་གི་ཐུམ་སྒྲལ་འདི་ཚུ་མར་ཕབ་འབད་འོང་:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་བསྒྱུར་བཅོས་འབད་འོང་:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s( %s་གིས་སྦེ)"
-
-#: apt-private/private-output.cc:696
-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"
-"ཁྱོད་ཀྱིས་ཁྱོད་རང་ག་ཅི་འབདཝ་ཨིན་ན་ངེས་སྦེ་མ་ཤེས་ཚུན་འདི་འབད་ནི་མི་འོང་།!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།"
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།"
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།"
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "རྩ་བསྐྲད་འབད་ནི་ལུ་%lu་དང་%lu་ཡར་བསྐྱེད་མ་འབད་བས།\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "ཝའི།"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1677,20 +1674,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "ཨེབ།"
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "ཨེབ།:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "ལེན:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "ལེན:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "ཨེལ་ཇི་ཨེན:"
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "ཨེལ་ཇི་ཨེན:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "ཨི་ཨར་ཨར།"
+#, c-format
+msgid "Err:%lu %s"
+msgstr "ཨི་ཨར་ཨར།:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1716,17 +1717,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1804,7 +1805,7 @@ msgstr ""
msgid "Merging available information"
msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1828,46 +1829,46 @@ msgstr ""
" -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་"
"བཟུམ།\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "%s་འདི་ལུ་ངོ་བཤུས་འབད་མ་ཚུགས།"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr " %sལུ་འབྲི་མ་ཚུགས།"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "debconf ་་འཐོན་རིམ་འདི་ལེན་མ་ཚུགས། debconf འདི་གཞི་བཙུགས་འབད་ཡི་ག་?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "ཐུམ་སྒྲིལ་རྒྱ་བསྐྱེད་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "སྣོད་ཐོ་%s་ལས་སྦྱོར་འབདཝ་ད་འཛོལ་བ་འཐོན་ཡི།"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "འབྱུང་ཁུངས་རྒྱ་བསྐྱེད་ཀྱི་ཐོག་ཡིག་འདི་གནམ་མེད་ས་མེད་རིང་པས།"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "ནང་དོན་ཡིག་སྣོད་ལུ་མགོ་ཡིག་འཛོལ་བ་འབྲི་ནིའི་མགོ་ཡིག"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "%sའཛོལ་བ་ལས་སྦྱོར་འབད་ནིའི་ནང་དོན།"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1951,11 +1952,11 @@ msgstr ""
" -c=? འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷག\n"
" -o=? མཐུན་སྒྲིག་རིམ་སྒྲིག་གི་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབད།"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "སེལ་འཐུ་ཚུ་མཐུན་སྒྲིག་མིན་འདུག"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཐུམ་སྒྲིལ་ཡིག་སྣོད་སྡེ་ཚན་`%s'ནང་བརླག་སྟོར་ཞུགས་ནུག"
@@ -2068,22 +2069,22 @@ msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེ
msgid "Archive had no package field"
msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s ་རྒྱུན་སྐྱོང་པ་འདི་ %s ཨིན་ %s མེན།\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n"
@@ -2169,7 +2170,7 @@ msgstr "%s་འབྲེལ་འཐུད་མེདཔ་བཟོ་ནི
msgid "Failed to rename %s to %s"
msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2194,11 +2195,11 @@ msgstr ""
" -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་"
"བཟུམ།\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "མ་ཤེས་པའི་ཐུམ་སྒྲིལ་གི་དྲན་ཐོ།"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2274,6 +2275,26 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འཐོབ།"
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་"
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་ན་གནས་ཚད་ཡིག་སྣོད་ཚུ་ མིང་དཔྱད་ཡང་ན་ཁ་ཕྱེ་མ་ཚུགས།"
@@ -2286,178 +2307,299 @@ msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ན
msgid "The list of sources could not be read."
msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།"
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་སྟོངམ།"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "ཐུམ་སྒྲིས་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ མི་མཐུན་པའི་འཐོན་རིམ་ཅིག་ཨིན་པས།"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "འ་ནི་ཨེ་པི་ཊི་ འདི་གིས་ '%s'འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་དེ་ལུ་རྒྱབ་སྐྱོར་མི་འབད་བས།"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་འདི་བཟོ་བཀོད་སོ་སོ་ཅིག་གི་དོན་ལུ་བཟོ་བརྩིགས་འབད་འབདཝ་ཨིནཔས།"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "རྟེནམ་ཨིན།"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "སྔོན་གོང་མ་རྟེནམ་ཨིན།"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "བསམ་འཆར་བཀོདཔ་ཨིན།"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "འོས་སྦྱོར་འབདཝ་ཨིན།"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "མི་མཐུནམ་ཨིན།"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "ཚབ་བཙུགསཔ་ཨིན།"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "ཕན་མེདཔ་བཟོཝ་ཨིན།"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "གལ་ཅན།"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "དགོས་མཁོ་ཡོདཔ།"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "ཚད་ལྡན།"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "གདམ་ཁ་ཅན།"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "ཐེབས།"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "ཐབས་ལམ་འདྲེན་བྱེད་%s་འདི་མ་འཐོབ།"
+msgid "Index file type '%s' is not supported"
+msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:206
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "ཐབས་ལམ་ %s འདི་ངེས་བདེན་སྦེ་འགོ་མ་བཙུགས་འབད།"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:208
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "ཁ་ཡིག་བཀོད་ཡོད་པའི་ ཌིསི་འདི་བཙུགས་གནང་། '%s'འདྲེན་འཕྲུལ་ནང་'%s' དང་ལོག་ལྡེ་འདི་ཨེབ།་"
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོ།"
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།"
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "མི་ངོ་འཐོན་རིམཚུ།"
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "བརྟེན་པའི་བཟོ་བཏོན།"
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s་ཁ་ཕྱེ་དོ།"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག"
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
+
+#: apt-pkg/sourcelist.cc:416
#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+msgid "Clean of %s is not supported"
+msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s་ ངོ་བཤུས་འབད་མ་ཚུགས།"
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "འདྲ་མཛོད་ལུ་མཐུན་འགྱུར་མེན་པའི་འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་ཅིག་འདུག"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:279
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
+
+#: apt-pkg/pkgcachegen.cc:591
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།"
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "ཚད་མ་མཐུན།"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "འཛོལ་བ་འབྲི།"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2465,7 +2607,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
@@ -2481,49 +2623,49 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2532,127 +2674,55 @@ msgstr ""
" %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
"འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།"
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "འདྲ་མཛོད་ལུ་མཐུན་འགྱུར་མེན་པའི་འཐོན་རིམ་བཟོ་ནིའི་རིམ་ལུགས་ཅིག་འདུག"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐུམ་སྒྲིལ་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:279
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་བརྟེན་པའི་ཨང་གྲངས་ལས་ལྷག་ནུག"
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "%sསིལ་ཚོང་པ་སྡེབ་ཚན་གྱི་ནང་ན་མཛུབ་རྗེས་མིན་འདུག"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "ཡིག་མཛོད་སྣོད་ཐོ་ %s་ ཆ་ཤས་འདི་བརླག་སྟོར་ཞུགས་ཏེ་འདུག"
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཀྱི་དབྱེ་བ་ '%s' འདི་རྒྱབ་སྐྱོར་མ་འབད་བས།"
+msgid "Unable to lock directory %s"
+msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི་ཡིག་སྣོད་%li (%s ལྷག་ལུས་དོ།)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr " %li་གི་བརླག་སྟོར་ཟུགསཔའི་ཡིག་སྣོད་ %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"ཟུར་ཐོ་ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག་ འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་"
-"རྙིངམ་འདི་ཚུ་ལག་ལེན་འཐབ་ནུག"
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
"ཁྱོད་རའི་sources.listགི་ཐོ་ཡིག་ནང་ལུ་ཁྱོད་ཀྱི་ 'འབྱུང་ཁུངས་' ཡུ་ཨར་ཨའི་ཚུ་་ལ་ལུ་ཅིག་བཙུགས་དགོ"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s་ ངོ་བཤུས་འབད་མ་ཚུགས།"
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2674,19 +2744,19 @@ msgstr "ངོ་རྟགས་ཨང་གི་དབྱེ་བ་ %s འ
msgid "No priority (or zero) specified for pin"
msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས།"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2698,10 +2768,14 @@ msgstr ""
"འདི་འབདཝ་ད་ཁྱོད་ཀྱི་ཐད་རི་འབའ་རི་འབད་དགོཔ་ཨིན་པ་ཅིན་ APT::Force-LoopBreak གདམ་ཁ་འདི་ཤུགས་"
"ལྡན་བཟོ།"
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག"
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"ཟུར་ཐོ་ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག་ འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་"
+"རྙིངམ་འདི་ཚུ་ལག་ལེན་འཐབ་ནུག"
#: apt-pkg/cdrom.cc:571
#, fuzzy
@@ -2769,11 +2843,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "ཐུམ་སྒྲིལ་གྱིཐོ་ཡིག་ཚུ་འདྲ་བཤུས་རྐྱབ་དོ..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "འབྱུང་ཁུངས་ཀྱི་ཐོ་ཡིག་གསརཔ་ཅིག་འབྲི་དོ།\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "འ་ནི་ ཌིསིཀ་གི་དོན་ལུ་ འབྱུང་ཁུངས་ཧྲིལ་བུ་ཚུ་:\n"
@@ -2785,7 +2859,7 @@ msgstr ""
"ཐུམ་སྒྲིལ་%s་འདི་ལོག་འདི་རང་གཞི་བཙུགས་འབད་དགོཔ་འདུག་ འདི་འབདཝ་ད་འདི་གི་དོན་ལུ་ཡིག་མཛོད་ཅིག་འཚོལ་"
"མ་ཐོབ།"
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2793,139 +2867,41 @@ msgstr ""
"འཛོལ་བ་ pkgProblemResolver::གིས་བཟོ་བཏོན་འབད་ཡོད་པའི་མཚམས་དེ་ཚུ་མོས་མཐུན་བཟོཝ་ཨིན འ་ནི་ཐུམ་"
"སྒྲིལ་ཚུ་འཛིན་པའི་རྒྱུ་རྐྱེན་ལས་བརྟེན་ཨིན་པས།"
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག"
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-
-#: apt-pkg/indexrecords.cc:83
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-
-#: apt-pkg/indexrecords.cc:91
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:152
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
-
-#: apt-pkg/indexrecords.cc:171
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "རྟེན་འབྲེལ་གྱི་རྩ་འབྲེལ་བཟོ་བརྩིགས་འབད་དོ།"
-#: apt-pkg/sourcelist.cc:170
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "མི་ངོ་འཐོན་རིམཚུ།"
-#: apt-pkg/sourcelist.cc:173
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "བརྟེན་པའི་བཟོ་བཏོན།"
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/depcache.cc:252
#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
+msgid "Failed to open StateFile %s"
+msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:258
#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
-
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "%s་ཁ་ཕྱེ་དོ།"
-
-#: apt-pkg/sourcelist.cc:371
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།"
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
-
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།"
+msgid "Unable to parse package file %s (%d)"
+msgstr "%s (%d)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2937,208 +2913,101 @@ msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་ད
msgid "Version '%s' for '%s' was not found"
msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
+#: apt-pkg/indexrecords.cc:83
#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "%s་རིམ་སྒྲིག་འབད་དོ།"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།"
+msgid "Unable to parse Release file %s"
+msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/indexrecords.cc:91
#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "No sections in Release file %s"
+msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
-#: apt-pkg/deb/dpkgpm.cc:112
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Running post-installation trigger %s"
+msgid "No Hash entry in Release file %s"
msgstr ""
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/indexrecords.cc:145
#, fuzzy, c-format
-msgid "Directory '%s' missing"
-msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/indexrecords.cc:164
#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།"
-
-#: apt-pkg/deb/dpkgpm.cc:1012
-#, c-format
-msgid "Installed %s"
-msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
-
-#: apt-pkg/deb/dpkgpm.cc:1017
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
-
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, c-format
-msgid "Removed %s"
-msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Completely removed %s"
-msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr " %sལུ་འབྲི་མ་ཚུགས།"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
+#, c-format
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "%lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
+msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3274,35 +3143,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... འབད་ཚར་ཡོད།"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབད་མ་ཚུགས།"
@@ -3365,107 +3205,263 @@ msgstr "སྦྱར་བརྩེགས་ས་ཚིགས་%s་འདི
msgid "Failed to stat the cdrom"
msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "ངོ་མ་ཤེས་པའི་སྡུད་ཚིག་གི་དབྱེ་བ:'%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "་ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: སྡེབ་ཚན་གྱིས་མིང་མེད་མི་དང་གཅིག་ཁར་འགོ་བཙུགསཔ་ཨིན"
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཟོ་ཉེས་འགྱུར་བའི་ངོ་རྟགས།"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:གནས་གོང་གི་ཤུལ་ལས་མཁོ་མེད་ཐེབས།"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་རྐྱངམ་ཅིག་བྱིན་ཚུགས།"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:འདུ་འཛོམས་འབད་འབདཝ་ལེ་ཤཱ་གྲངས་སུ་བཙུགསཔ་ཨིན།"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ནཱ་ལས་རང་འགོ་བཙུགས་གྲངས་སུ་བཙུགས་ཏེ་ཡོད།"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: རྒྱབ་སྐྱོར་མ་འབད་བར་ཡོད་པའི་'%s'བཀོད་རྒྱ།"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, fuzzy, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་རྐྱངམ་ཅིག་བྱིན་ཚུགས།"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ཡིག་སྣོད་ཀྱི་མཇུག་ལུ་མཁོ་མེད་ཐེབས།"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "བརྡ་བཀོད་གྲལ་ཐིག་གྱི་གདམ་ཁ་'%c'[%s་ནང་ལས་]འདི་མ་ཤེས་པས།"
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "བ་རྡ་བཀོད་གྲལ་ཐིག་གི་གདམ་ཁ་%s་འདི་ཧ་མ་གོ་བས།"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "བརྡ་བཀོད་གྲལ་ཐིག་གི་གདམ་ཁ་%s་འདི་བུ་ལིན་མེན་པས།"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "གདམ་ཁ་%s་ལུ་སྒྲུབ་རྟགས་ཅིག་དགོ་པས།"
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "གདམ་ཁ་%s:རིམ་སྒྲིག་གི་རྣམ་གྲངས་གསལ་བཀོད་ལུ་ =<val> ་ཅིག་དགོཔ་ཨིན།"
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "གདམ་ཁ་ %s ་ལུ་'%s'་མེན་པར་ ཧྲིལ་ཨང་སྒྲུབ་རྟགས་ཅིག་དགོས་མཁོ་ཡོདཔ་ཨིན"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "གདམ་ཁ་'%s'འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "དྲན་ཤེས་ %s་འདི་ཧ་གོ་མ་ཚུགས་པས་ བདེན་པ་ཡང་ན་རྫུན་པ་ལུ་འབད་རྩོལ་བསྐྱེདཔ།"
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "ནུས་མེད་བཀོལ་སྤྱོད་%s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "%s་རིམ་སྒྲིག་འབད་དོ།"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "%s་ རིམ་སྒྲིག་ལུ་གྲ་སྒྲིག་འབད་དོ།"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "%s་ རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "རྩ་བསྐྲད་བཏང་ཡོད་པའི་%s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་གཏང་ནིའི་དོན་ལུ་གྲ་སྒྲིག་འབད་དོ།"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr " %sལུ་འབྲི་མ་ཚུགས།"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "ད་ལྟོ་ཡང་འབྲེལ་ལམ་ཡོད་པའི་མཐུད་མཚམས་གུར་བཀོག་བཞག་མཐུད་མཚམས་དེ་བོད་བརྡ་འབད་འདི་ཡོད།"
@@ -3570,7 +3566,7 @@ msgstr "འ་ནི་འདི་ ཌི་ཨི་བི་ཡིག་མ
msgid "Internal error, could not locate member %s"
msgstr "ནང་འཁོད་འཛོལ་བ་གིས་འཐུས་མི་%sའདི་ག་ཡོད་འཚོལ་མ་འཐོབ།"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "མིང་དཔྱད་འབད་མ་བཏུབ་པའི་ཚད་འཛིན་ཡིག་སྣོད།"
@@ -3599,23 +3595,23 @@ msgstr "ཡིག་མཛོད་འདི་གནམ་མེད་ས་མ
msgid "Failed to read the archive headers"
msgstr "ཡིག་མཛོད་མགོ་ཡིག་ཚུ་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "རྒྱུད་དུང་ཚུ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "ཇི་ཛིཔ་འདི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "ངན་ཅན་གྱི་ཡིག་མཛོད།"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "ཊར་ཅེག་སམ་དེ་འཐུས་ཤོར་བྱུང་ཡོད་ ཡིག་མཛོད་ངན་ཅན་བྱུང་ནུག"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "མ་ཤེས་པའི་ ཊཱར་་མགོ་ཡིག་་དབྱེ་བ་ %u་ འཐུས་མི་ %s།"
diff --git a/po/el.po b/po/el.po
index d9bca293a..98e1f31c9 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_el\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2008-08-26 18:25+0300\n"
"Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n"
"Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -32,145 +32,145 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Το πακέτο %s με έκδοση %s έχει ανικανοποίητες εξαρτήσεις:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Συνολικά Ονόματα Πακέτων : "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Συνολο Δομών Πακέτου : "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Κανονικά Πακέτα: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Πλήρως Εικονικά Πακέτα: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Μονά Εικονικά Πακέτα: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Μικτά Εικονικά Πακέτα: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr "Αγνοούμενα: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Σύνολο Διαφορετικών Εκδόσεων: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Σύνολο Διαφορετικών Εκδόσεων: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Σύνολο Εξαρτήσεων: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Σύνολο σχέσεων Εκδ/Αρχείων: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Σύνολο Αντιστοιχίσεων Παροχών: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Σύνολο Κοινών Στοιχειοσειρών : "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Σύνολο χώρου ασφαλείας: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Συνολικός Καταμετρημένος Χώρος: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Το αρχείο πακέτου %s δεν είναι ενημερωμένο."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Δε βρέθηκαν πακέτα"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Πρέπει να δώσετε τουλάχιστον ένα μοτίβο αναζήτησης"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Αδυναμία εντοπισμού του πακέτου %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Αρχεία Πακέτου:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
"Η cache δεν είναι ενημερωμένη, αδυναμία παραπομπής σε ένα αρχείο πακέτου"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Καθηλωμένα Πακέτα:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(δε βρέθηκαν)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Εγκατεστημένα: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Υποψήφιο: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(κανένα)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Καθήλωση Πακέτου: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Πίνακας Έκδοσης:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -245,21 +245,21 @@ msgstr ""
" -o=? Χρήση μιας αυθαίρετη επιλογής ρυθμίσεων, πχ -o dir::cache=/tmp\n"
"Δείτε τις σελίδες man του apt-cache(8) και apt.conf(5) για πληροφορίες.\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
"Παρακαλώ δώστε ένα όνομα για αυτόν τον δίσκο, όπως 'Debian 5.0.3 Disk 1'"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Παρακαλώ εισάγετε το δίσκο στη συσκευή και πατήστε enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Αποτυχία σύνδεσης του %s σε %s"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -267,7 +267,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Επαναλάβετε την διαδικασία για τα υπόλοιπα CD από το σετ σας."
@@ -304,87 +304,82 @@ msgstr ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Επιλογή του %s ώς λίστας πηγαίων πακέτων αντί της %s\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "το %s έχει εγκατασταθεί αυτόματα\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
"υλικό"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Αδύνατο το κλείδωμα του καταλόγου"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
"κωδικάτου"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -392,95 +387,95 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Μεταφόρτωση Κωδικα %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Η απογονική διεργασία απέτυχε"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -489,7 +484,7 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το %s δεν επιτρέπεται στο "
"πακέτο %s"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -497,14 +492,14 @@ msgid ""
msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
"είναι νεώτερο"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -513,7 +508,7 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
"εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις της έκδοσης"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -522,17 +517,17 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν έχει "
"υποψήφιαέκδοση"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
@@ -641,11 +636,11 @@ msgstr ""
"Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
"κωδικάτου"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -659,52 +654,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "αλλά δεν είναι εγκατεστημένο"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "Αποτυχία ανοίγματος του %s"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -925,7 +921,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο
msgid "Unable to accept connection"
msgstr "Αδύνατη η αποδοχή συνδέσεων"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Πρόβλημα κατά το hashing του αρχείου"
@@ -1014,18 +1010,18 @@ msgstr "Κάτι παράξενο συνέβη κατά την εύρεση το
msgid "Unable to connect to %s:%s:"
msgstr "Αδύνατη η σύνδεση στο %s %s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του "
"αποτυπώματος?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
#, fuzzy
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
@@ -1033,22 +1029,22 @@ msgstr ""
"εγκατεστημένο το gnupg;)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1060,32 +1056,32 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Η επιλογή απέτυχε"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Λήξη χρόνου σύνδεσης"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
@@ -1093,53 +1089,296 @@ msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
msgid "Waiting for headers"
msgstr "Αναμονή επικεφαλίδων"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Ελαττωματική γραμμή επικεφαλίδας"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Άγνωστη μορφή ημερομηνίας"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Η σύνδεση απέτυχε"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Εσωτερικό Σφάλμα"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Διόρθωση εξαρτήσεων..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " απέτυχε."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Ετοιμο"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
+"προβλήματα."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Εγκατεστημένα]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Εγκατεστημένα]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Εγκατεστημένα]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Εγκατεστημένα]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "αλλά το %s είναι εγκατεστημένο"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "αλλά δεν είναι εγκαταστάσημο"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "αλλά είναι ένα εικονικό πακέτο"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "αλλά δεν είναι εγκατεστημένο"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "αλλά δεν πρόκειται να εγκατασταθεί"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " η"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (λόγω του %s) "
+
+#: apt-private/private-output.cc:696
+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"
+"Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu επανεγκατεστημένα,"
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu υποβαθμισμένα, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[Ν/ο]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[ν/Ο]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "σφάλμα μεταγλωτισμου - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Η εντολή update δεν παίρνει ορίσματα"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!"
@@ -1403,249 +1642,6 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Διόρθωση εξαρτήσεων..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " απέτυχε."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Αδύνατη η διόρθωση των εξαρτήσεων"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Αδύνατη η ελαχιστοποίηση του συνόλου αναβαθμίσεων"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Ετοιμο"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Ίσως να πρέπει να τρέξετε apt-get -f install για να διορθώσετε αυτά τα "
-"προβλήματα."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Εγκατεστημένα]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Εγκατεστημένα]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Εγκατεστημένα]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Εγκατεστημένα]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "αλλά το %s είναι εγκατεστημένο"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "αλλά το %s πρόκειται να εγκατασταθεί"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "αλλά δεν είναι εγκαταστάσημο"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "αλλά είναι ένα εικονικό πακέτο"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "αλλά δεν είναι εγκατεστημένο"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "αλλά δεν πρόκειται να εγκατασταθεί"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " η"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξαρτήσεις:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Τα ακόλουθα ΝΕΑ πακέτα θα εγκατασταθούν:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Τα ακόλουθα πακέτα θα ΑΦΑΙΡΕΘΟΥΝ:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Τα ακόλουθα πακέτα θα μείνουν ως έχουν:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστούν:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Τα ακόλουθα πακέτα θα ΥΠΟΒΑΘΜΙΣΤΟΥΝ:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Τα ακόλουθα κρατημένα πακέτα θα αλλαχθούν:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (λόγω του %s) "
-
-#: apt-private/private-output.cc:696
-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"
-"Αυτό ΔΕΝ θα έπρεπε να συμβεί, εκτός αν ξέρετε τι ακριβώς κάνετε!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu επανεγκατεστημένα,"
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu υποβαθμισμένα, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu θα αφαιρεθούν και %lu δεν αναβαθμίζονται.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[Ν/ο]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[ν/Ο]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "σφάλμα μεταγλωτισμου - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Η εντολή update δεν παίρνει ορίσματα"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1699,20 +1695,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Hit "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Hit:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Φέρε:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Φέρε:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Αγνόησε "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Αγνόησε:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Σφάλμα "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Σφάλμα:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1738,17 +1738,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Αδύνατη η ανάγνωση του %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1826,7 +1826,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Σύμπτυξη Διαθέσιμων Πληροφοριών"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1850,46 +1850,46 @@ msgstr ""
" -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
" -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Αδύνατη η εύρεση της κατάστασης του %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Αδύνατη η εγγραφή στο %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Δεν βρέθηκε η έκδοση του debconf. Είναι το debconf εγκατεστημένο;"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Ο κατάλογος επεκτάσεων του πακέτου είναι υπερβολικά μακρύς"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Σφάλμα επεξεργασίας του καταλόγου %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Ο κατάλογος επεκτάσεων των πηγών είναι υπερβολικά μακρύς"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Σφάλμα εγγραφής κεφαλίδων στο αρχείο περιεχομένων"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Σφάλμα επεξεργασίας περιεχομένων του %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1973,11 +1973,11 @@ msgstr ""
" -c=? Χρήση αυτού του αρχείου ρυθμίσεων\n"
" -o=? Ορισμός αυθαίρετης επιλογής ρύθμισης"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Δεν ταιριαξε καμία επιλογή"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Λείπουν μερικά αρχεία από την ομάδα πακέτων '%s'"
@@ -2090,22 +2090,22 @@ msgstr " Αποσύνδεση ορίου του %sB hit.\n"
msgid "Archive had no package field"
msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s συντηρητής είναι ο %s όχι ο %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s δεν έχει εγγραφή πηγαίας παράκαμψης\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n"
@@ -2191,7 +2191,7 @@ msgstr "Πρόβλημα κατά την αποσύνδεση του %s"
msgid "Failed to rename %s to %s"
msgstr "Αποτυχία μετονομασίας του %s σε %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2216,11 +2216,11 @@ msgstr ""
" -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
" -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Άγνωστη εγγραφή πακέτου!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2293,6 +2293,28 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Ανόμοιο MD5Sum"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί."
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
+"enter."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2307,178 +2329,301 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Άδειο cache πακέτων"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Το αρχείο cache των πακέτων είναι ασύμβατης έκδοσης"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Αυτό το APT δεν υποστηρίζει το Σύστημα Απόδοσης Έκδοσης '%s'"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Η cache πακέτων κατασκευάστηκε για μια διαφορετική αρχιτεκτονική"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Εξαρτάται από"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "ΠροΕξαρτάται από"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Προτείνει"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Συστήνει"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Ασύμβατο με"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Αντικαθιστά"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Απαρχαιώνει"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Χαλάει"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "σημαντικό"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "απαιτούμενο"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "καθιερωμένο"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "προαιρετικό"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "επιπλέον"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Υπολογισμός της αναβάθμισης"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ο οδηγός μεθόδου %s δεν μπορεί να εντοπιστεί."
+msgid "Index file type '%s' is not supported"
+msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
+
+#: apt-pkg/sourcelist.cc:206
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:208
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Παρακαλώ εισάγετε το δίσκο με ετικέτα '%s' στη συσκευή '%s' και πατήστε "
-"enter."
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Άνοιγμα του %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Κατασκευή Δένδρου Εξαρτήσεων"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Αδύνατη η εύρεση της κατάστασης του %s."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Υποψήφιες Εκδόσεις"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Παραγωγή Εξαρτήσεων"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Ανάγνωση περιγραφής της τρέχουσας κατάσταση"
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT."
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Εκπληκτικό, υπερβήκατε τον αριθμό των περιγραφών που υποστηρίζει το APT."
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT."
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Αποτυχία ανοίγματος του αρχείου κατάστασης %s"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s"
+msgid "Couldn't stat source package list %s"
+msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Ανάγνωση Λιστών Πακέτων"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Συλλογή Παροχών Αρχείου"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Ανόμοιο μέγεθος"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Μη έγκυρη λειτουργία %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Σφάλμα εγγραφής"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2486,7 +2631,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
@@ -2502,49 +2647,49 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2553,12 +2698,12 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2566,117 +2711,42 @@ msgstr ""
"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
"πακέτο %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Εκπληκτικό, υπερβήκατε τον αριθμό των ονομάτων πακέτων που υποστηρίζει το "
-"APT."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Εκπληκτικό, υπερβήκατε τον αριθμό των εκδόσεων που υποστηρίζει το APT."
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Εκπληκτικό, υπερβήκατε τον αριθμό των περιγραφών που υποστηρίζει το APT."
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Ανάγνωση Λιστών Πακέτων"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Συλλογή Παροχών Αρχείου"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Η εγγραφή κατασκευαστή %s δεν περιέχει ταυτότητα"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Ο φάκελος λιστών %spartial αγνοείται."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Ο τύπος αρχείου ευρετηρίου '%s' δεν υποστηρίζεται"
+msgid "Unable to lock directory %s"
+msgstr "Αδύνατο το κλείδωμα του καταλόγου"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Κατέβασμα του αρχείου %li του %li (απομένουν %s)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Λήψη αρχείου %li του %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα "
-"στη θέση τους."
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Πρέπει να τοποθετήσετε μερικά URI 'πηγών' στο sources.list"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Αδύνατη η εύρεση της κατάστασης του %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2699,19 +2769,19 @@ msgid "No priority (or zero) specified for pin"
msgstr ""
"Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2723,10 +2793,14 @@ msgstr ""
"είναι καλό, αλλά εάν πραγματικά θέλετε να συνεχίσετε ενεργοποιήστε την "
"επιλογή APT::Force-LoopBreak option."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα "
+"στη θέση τους."
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2795,11 +2869,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Αντιγραφή λιστών πακέτων..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Eγγραφή νέας λίστας πηγών\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n"
@@ -2811,7 +2885,7 @@ msgstr ""
"Το πακέτο '%s' χρειάζεται να επανεγκατασταθεί, αλλά είναι αδύνατη η εύρεση "
"κάποιας κατάλληλης αρχείοθήκης."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2819,139 +2893,40 @@ msgstr ""
"Σφάλμα, το pkgProblemResolver::Resolve παρήγαγε διακοπές, αυτό ίσως "
"προκλήθηκε από κρατούμενα πακέτα."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-
-#: apt-pkg/indexrecords.cc:91
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:152
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-
-#: apt-pkg/sourcelist.cc:173
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-
-#: apt-pkg/sourcelist.cc:190
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-
-#: apt-pkg/sourcelist.cc:193
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Κατασκευή Δένδρου Εξαρτήσεων"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Υποψήφιες Εκδόσεις"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Παραγωγή Εξαρτήσεων"
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Άνοιγμα του %s"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Ανάγνωση περιγραφής της τρέχουσας κατάσταση"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
+msgid "Failed to open StateFile %s"
+msgstr "Αποτυχία ανοίγματος του αρχείου κατάστασης %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
+msgid "Failed to write temporary StateFile %s"
+msgstr "Αποτυχία εγγραφής του αρχείου κατάστασης %s"
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος "
+msgid "Unable to parse package file %s (%d)"
+msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (%s)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2963,208 +2938,101 @@ msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
msgid "Version '%s' for '%s' was not found"
msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Αδύνατη η εύρεση του πακέτου %s"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Εγκατάσταση του %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Ρύθμιση του %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Αφαιρώ το %s"
+#: apt-pkg/indexrecords.cc:83
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/indexrecords.cc:91
#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Το %s διαγράφηκε πλήρως"
+msgid "No sections in Release file %s"
+msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
-#: apt-pkg/deb/dpkgpm.cc:111
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Noting disappearance of %s"
+msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Εκτέλεση του post-installation trigger %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Ο φάκελος %s αγνοείται."
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/indexrecords.cc:145
#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Προετοιμασία του %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "Ξεπακετάρισμα του %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "Προετοιμασία ρύθμισης του %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1012
-#, c-format
-msgid "Installed %s"
-msgstr "Έγινε εγκατάσταση του %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1017
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Προετοιμασία για την αφαίρεση του %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, c-format
-msgid "Removed %s"
-msgstr "Αφαίρεσα το %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Προετοιμασία πλήρης αφαίρεσης του %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1025
-#, c-format
-msgid "Completely removed %s"
-msgstr "Το %s διαγράφηκε πλήρως"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
+#: apt-pkg/indexrecords.cc:164
#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Αδύνατη η εγγραφή στο %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
+#, c-format
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Αδύνατο το κλείδωμα του καταλόγου"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "%lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
+msgstr "Η επιλογή %s δε βρέθηκε"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3302,35 +3170,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Ολοκληρώθηκε"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Η επιλογή %s δε βρέθηκε"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Αδύνατη η απεικόνιση mmap ενός άδειου αρχείου"
@@ -3393,110 +3232,266 @@ msgstr "Αδύνατη η εύρεση της κατάστασης του σημ
msgid "Failed to stat the cdrom"
msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Μη αναγνωρισμένος τύπος σύντμησης: '%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Συντακτικό σφάλμα %s:%u: Το block αρχίζει χωρίς όνομα."
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Συντακτικό σφάλμα %s:%u: Λάθος μορφή Ετικέτας (Tag)"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες μετά την τιμή"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Συντακτικό σφάλμα %s:%u: Υπερβολικός αριθμός συνδυασμένων includes"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Συντακτικό σφάλμα %s:%u: Συμπεριλαμβάνεται από εδώ"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστηριζόμενη εντολή '%s'"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, fuzzy, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Η επιλογή γραμμής εντολών '%c' [από %s] δεν είναι γνωστή."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Η επιλογή γραμμής εντολών %s δεν είναι κατανοητή"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Η επιλογή γραμμής εντολών %s δεν είναι boolean"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Η επιλογή %s απαιτεί ένα όρισμα."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
"Επιλογή %s: Οι προδιαγραφές του αντικειμένου ρυθμίσεων απαιτούν =<val>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "Επιλογή %s: απαιτείται ένας ακέραιος αριθμός ως όρισμα, όχι '%s'"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Η επιλογή '%s' έχει υπερβολικό μήκος"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "Η τιμή %s δεν είναι κατανοητή, δοκιμάστε σωστό (true) ή λάθος (false)."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Μη έγκυρη λειτουργία %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Εγκατάσταση του %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Ρύθμιση του %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Αφαιρώ το %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Το %s διαγράφηκε πλήρως"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Εκτέλεση του post-installation trigger %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Ο φάκελος %s αγνοείται."
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Προετοιμασία του %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Ξεπακετάρισμα του %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Προετοιμασία ρύθμισης του %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "Έγινε εγκατάσταση του %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Προετοιμασία για την αφαίρεση του %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "Αφαίρεσα το %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Προετοιμασία πλήρης αφαίρεσης του %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "Το %s διαγράφηκε πλήρως"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Αδύνατη η εγγραφή στο %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Αδύνατο το κλείδωμα του καταλόγου"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "Κλήση του DropNode σε έναν ήδη συνδεδεμένο κόμβο"
@@ -3601,7 +3596,7 @@ msgstr "Αυτό δεν είναι ένα έγκυρο αρχείο DEB, αγν
msgid "Internal error, could not locate member %s"
msgstr "Εσωτερικό Σφάλμα, αδυναμία εντοπισμού του μέλους %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Μη αναλύσιμο αρχείο control"
@@ -3630,23 +3625,23 @@ msgstr "Η αρχειοθήκη είναι πολύ μικρή"
msgid "Failed to read the archive headers"
msgstr "Αποτυχία ανάγνωσης των επικεφαλίδων της αρχειοθήκης"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Αποτυχία κατά τη δημιουργία διασωληνώσεων"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Αποτυχία κατά την εκτέλεση του gzip "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Κατεστραμμένη αρχειοθήκη"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Το Checksum του tar απέτυχε, η αρχείοθήκη είναι κατεστραμμένη"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Άγνωστη επικεφαλίδα TAR τύπος %u, μέλος %s"
diff --git a/po/es.po b/po/es.po
index 7e06fb2bd..a2a9a71e9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,15 +2,16 @@
# Copyright (C) 2002-2010 Free Software Foundation, Inc.
#
#
-# Curren translator:
-# - Javier Fernandez-Sanguino <jfs@debian.org> 2003, 2006-2008
+# Current translator:
+# - Manuel "Venturi" Porras Peralta <venturi@openmailbox.org>, 2014
#
# Previous Translators and reviewers:
# - Rafael Sepulveda <drs@gnulinux.org.mx>, 2002.
# - Asier Llano Palacios <asierllano@infonegocio.com>
# - Ruben Porras Campo <nahoo@inicia.es> 2004
+# - Javier Fernandez-Sanguino <jfs@debian.org> 2003, 2006-2008
#
-# Traductores, si no conoce el formato PO, merece la pena leer la
+# Traductores, si no conoce el formato PO, merece la pena leer la
# documentación de gettext, especialmente las secciones dedicadas a este
# formato, por ejemplo ejecutando:
# info -n '(gettext)PO Files'
@@ -28,20 +29,20 @@
# traductor (campo Last-Translator) y ponga en copia a la lista de
# traducción de Debian al español (<debian-l10n-spanish@lists.debian.org>)
#
-#
msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.10\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
-"PO-Revision-Date: 2011-01-24 11:47+0100\n"
-"Last-Translator: Javier Fernández-Sanguino Peña <jfs@debian.org>\n"
-"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
+"PO-Revision-Date: 2014-11-20 02:25+0100\n"
+"Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox."
+"org>\n"
+"Language-Team: Español; Castellano <debian-l10n-spanish@lists.debian.org>\n"
"Language: es\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-POFile-SpellExtra: BD getaddrinfo dist show xvcg Filename sources cachés\n"
"X-POFile-SpellExtra: dumpavail apport scanpackages yes pts URIs upgrade\n"
"X-POFile-SpellExtra: Hash TAR mmap fix Immediate li source add Pathprefix\n"
@@ -71,153 +72,153 @@ msgstr ""
"X-POFile-SpellExtra: sortpkgs sB man extracttemplates bzr potato clear\n"
"X-POFile-SpellExtra: autoclean showsrc desactualizados clean gzip TYPE\n"
"X-POFile-SpellExtra: sinfo Acquire\n"
+"X-Generator: Gtranslator 2.91.6\n"
#: cmdline/apt-cache.cc:149
#, 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:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Nombres de paquetes totales: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Estructuras de paquetes totales: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Paquetes normales: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Paquetes virtuales puros: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Paquetes virtuales únicos: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Paquetes virtuales mixtos: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Faltan: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Versiones diferentes totales: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Descripciones diferentes totales: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Dependencias totales: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Relaciones versión/archivo totales: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Relaciones descripción/archivo totales: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Mapeo Total de Provisiones: "
# globbed -> globalizadas ? (jfs)
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Cadenas globalizadas totales: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Espacio desperdiciado total: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Espacio registrado total: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "El archivo de paquetes %s está desincronizado."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "No se encontró ningún paquete"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Debe proporcionar al menos un patrón de búsqueda"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr ""
+msgstr "Esta orden está desfasada. Utilice «apt-mark showauto» en su lugar."
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "No se ha podido localizar el paquete %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Archivos de paquetes:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
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"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Paquetes con pin:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(no encontrado)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Instalados: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Candidato: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(ninguno)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Pin del paquete: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Tabla de versión:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s compilado en %s %s\n"
-#: cmdline/apt-cache.cc:1829
-#, fuzzy
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -254,27 +255,23 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
"Modo de 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"
+"apt-cache es una herramienta de bajo nivel que se utiliza para consultar\n"
+"información sobre los archivos binarios de caché de APT\n"
"\n"
"Órdenes:\n"
-" add - Agrega un archivo de paquete a la caché de fuentes\n"
" gencaches - Crea ambas cachés, la de paquetes y la de fuentes\n"
-" showpkg - Muestra información general para un solo paquete\n"
+" showpkg - Muestra información general para un único paquete\n"
" showsrc - Muestra la información de fuentes\n"
" stats - Muestra algunas estadísticas básicas\n"
" dump - Muestra el archivo entero en un formato terso\n"
-" dumpavail - Imprime un archivo disponible a la salida estándar\n"
+" dumpavail - Imprime un fichero disponible a la salida estándar\n"
" unmet - Muestra dependencias incumplidas\n"
-" search - Busca en la lista de paquetes por un patrón de expresión "
+" search - Busca en la lista de paquetes según un patrón de expresión "
"regular\n"
" show - Muestra un registro legible para el paquete\n"
-" showauto - Muestra una lista de los paquetes instalados de forma "
-"automática\n"
" depends - Muestra la información de dependencias en bruto para el "
"paquete\n"
" rdepends - Muestra la información de dependencias inversas del paquete\n"
@@ -287,36 +284,42 @@ msgstr ""
" -h Este texto de ayuda.\n"
" -p=? La caché de paquetes.\n"
" -s=? La caché de fuentes.\n"
-" -q Deshabilita el indicador de progreso.\n"
-" -i Muestra sólo dependencias importantes para la orden incumplida.\n"
+" -q Desactiva el indicador de progreso.\n"
+" -i Muestra solo dependencias importantes para la orden incumplida.\n"
" -c=? Lee este archivo de configuración\n"
-" -o=? Establece una opción de configuración arbitraria, \n"
-" p.ej. -o dir::cache=/tmp\n"
+" -o=? Establece una opción de configuración arbitraria, p.ej. -o dir::"
+"cache=/tmp\n"
"Vea las páginas del manual apt-cache(8) y apt.conf(5) para más información.\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
"Proporcione un nombre para este disco, como pueda ser «Debian 5.0.3 Disco 1»"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
-msgstr "Por favor, introduzca un disco en la unidad y pulse Intro"
+msgstr "Introduzca un disco en la unidad y pulse Intro"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "No se pudo montar «%s» como «%s»"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
"mount point."
msgstr ""
+"No se pudo detectar automáticamente ningún CD-ROM o no está usando el punto "
+"de montaje predeterminado.\n"
+"Puede intentar la opción --cdrom para establecer el punto de montaje del CD-"
+"ROM.\n"
+"Vea «man apt-cdrom» para más información sobre la autodetección y el punto "
+"de montaje del CD-ROM."
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Repita este proceso para el resto de los CDs del conjunto."
@@ -341,7 +344,8 @@ msgid ""
msgstr ""
"Uso: apt-config [opciones] orden\n"
"\n"
-"apt-config es una herramienta para leer el archivo de configuración de APT.\n"
+"apt-config es una herramienta sencilla para leer el archivo de configuración "
+"de APT.\n"
"\n"
"Comandos:\n"
" shell - Modo shell\n"
@@ -349,81 +353,78 @@ msgstr ""
"\n"
"Opciones:\n"
" -h Este texto de ayuda.\n"
-" -c=? Lee este archivo de configuración\n"
+" -c=? Lee este fichero de configuración\n"
" -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n"
" cache=/tmp\n"
-#: cmdline/apt-get.cc:246
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:224
+#, c-format
msgid "Can not find a package for architecture '%s'"
-msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
+msgstr "No se pudo encontrar ningún paquete para la arquitectura «%s»"
-#: cmdline/apt-get.cc:322
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:311
+#, c-format
msgid "Can not find a package '%s' with version '%s'"
-msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
+msgstr "No se pudo encontrar el paquete «%s» en la versión «%s»"
-#: cmdline/apt-get.cc:325
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:314
+#, c-format
msgid "Can not find a package '%s' with release '%s'"
-msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
+msgstr "No se pudo encontrar el paquete «%s» en la versión de publicación «%s»"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Escogiendo «%s» como paquete fuente en lugar de «%s»\n"
-#: cmdline/apt-get.cc:418
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:414
+#, c-format
msgid "Can not find version '%s' of package '%s'"
-msgstr "Ignorar la versión no disponible «%s» del paquete «%s»"
+msgstr "No se pudo encontrar la versión «%s» del paquete «%s»"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "No se pudo encontrar el paquete %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "fijado %s como instalado manualmente.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "fijado %s como instalado automáticamente.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
+"Esta orden está desfasada. Utilice «apt-mark auto» y «apt-mark manual» en su "
+"lugar."
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Error interno, el sistema de solución de problemas rompió algunas cosas"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "No se pudo bloquear el directorio %s"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "No se puede bloquear el directorio de descarga"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
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:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
-msgstr "No se pudo encontrar un paquete de fuentes para %s"
+msgstr "No se pudo encontrar el paquete de fuentes para %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -433,175 +434,177 @@ msgstr ""
"versiones «%s» en:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:785
+#, c-format
msgid ""
"Please use:\n"
"bzr branch %s\n"
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-"Por favor, utilice:\n"
-"bzr get %s\n"
+"Utilice:\n"
+"bzr branch %s\n"
"para obtener las últimas actualizaciones (posiblemente no publicadas aún) "
"del paquete.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Omitiendo el fichero ya descargado «%s»\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Necesito descargar %sB/%sB de archivos fuente.\n"
+msgstr "Se necesita descargar %sB/%sB de archivos fuente.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
-msgstr "Necesito descargar %sB de archivos fuente.\n"
+msgstr "Se necesita descargar %sB de archivos fuente.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Fuente obtenida %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "No se pudieron obtener algunos archivos."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
-msgstr "Descarga completa y en modo de sólo descarga"
+msgstr "Descarga completa y en modo de solo descarga"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
+msgstr ""
+"Omitiendo desempaquetamiento de paquetes fuente ya desempaquetados en %s\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Falló la orden de desempaquetamiento «%s».\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, 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:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Falló la orden de construcción «%s».\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Falló el proceso hijo"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Debe especificar al menos un paquete para verificar sus dependencias de "
"construcción"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
+"No hay información disponible de arquitectura para %s. Vea apt.conf(5) APT::"
+"Arquitecturas para la configuración"
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "No se pudieron procesar las dependencias de construcción"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, 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:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tiene dependencias de construcción.\n"
-#: cmdline/apt-get.cc:1288
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1279
+#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-"La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
-"el paquete %s"
+"La dependencia %s para %s no puede satisfacerse porque no se permite %s en "
+"los paquetes «%s»"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-"La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
+"La dependencia %s para %s no puede satisfacerse porque no se puede encontrar "
"el paquete %s"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, 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:1368
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1359
+#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
msgstr ""
-"La dependencia %s en %s no puede satisfacerse porque ninguna versión "
-"disponible del paquete %s satisface los requisitos de versión"
+"La dependencia %s para %s no puede satisfacerse porque la versión presentada "
+"del paquete %s no puede satisfacer los requisitos de versión"
-#: cmdline/apt-get.cc:1374
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1365
+#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-"La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
-"el paquete %s"
+"La dependencia %s para %s no puede satisfacerse porque el paquete %s no "
+"tiene ninguna versión presentada"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, 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:1412
+#: cmdline/apt-get.cc:1403
#, 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:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "No se pudieron procesar las dependencias de construcción"
#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
-#, fuzzy, c-format
+#, c-format
msgid "Changelog for %s (%s)"
-msgstr "Conectando a %s (%s)"
+msgstr "Informe de cambios para %s (%s)"
#: cmdline/apt-get.cc:1615
msgid "Supported modules:"
-msgstr "Módulos soportados:"
+msgstr "Módulos admitidos:"
#: cmdline/apt-get.cc:1656
-#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -659,6 +662,7 @@ msgstr ""
" install - Instala nuevos paquetes (paquete es libc6 y no libc6.deb)\n"
" remove - Elimina paquetes\n"
" purge - Elimina y purga paquetes\n"
+" autoremove - Elimina automáticamente todos los paquetes sin utilizar\n"
" source - Descarga archivos fuente\n"
" build-dep - Configura las dependencias de construcción para paquetes "
"fuente\n"
@@ -667,9 +671,9 @@ msgstr ""
" clean - Elimina los archivos descargados\n"
" autoclean - Elimina los archivos descargados antiguos\n"
" check - Verifica que no haya dependencias incumplidas\n"
-" markauto - Marca los paquetes indicados como instalados de forma "
-"automática\n"
-" unmarkauto - Marca los paquetes indicados como instalado de forma manual\n"
+" changelog - Descarga y muestra el informe de cambios para el paquete "
+"proporcionado\n"
+" download - Descarga el paquete binario al directorio actual\n"
"\n"
"Opciones:\n"
" -h Este texto de ayuda.\n"
@@ -677,8 +681,9 @@ msgstr ""
" -qq Sin salida, excepto si hay errores\n"
" -d Sólo descarga - NO instala o desempaqueta los archivos\n"
" -s No actúa. Realiza una simulación\n"
-" -y Asume Sí para todas las consultas\n"
-" -f Intenta continuar si la comprobación de integridad falla\n"
+" -y Asume Sí para todas las consultas y no pregunta\n"
+" -f Intenta corregir el sistema si tiene dependencias incumplidas en ese "
+"momento\n"
" -m Intenta continuar si los archivos no son localizables\n"
" -u Muestra también una lista de paquetes actualizados\n"
" -b Construye el paquete fuente después de obtenerlo\n"
@@ -693,18 +698,17 @@ msgstr ""
#: cmdline/apt-helper.cc:36
msgid "Need one URL as argument"
-msgstr ""
+msgstr "Se necesita una URL como argumento"
#: cmdline/apt-helper.cc:49
-#, fuzzy
msgid "Must specify at least one pair url/filename"
-msgstr "Debe especificar al menos un paquete para obtener su código fuente"
+msgstr "Debe especificar al menos una pareja url/nombre-fichero"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
-msgstr ""
+msgstr "Falló la descarga"
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -717,53 +721,64 @@ msgid ""
"\n"
" This APT helper has Super Meep Powers.\n"
msgstr ""
+"Uso: apt-helper [opciones] orden\n"
+" apt-helper [opciones] fichero-descarga uri ruta-destino\n"
+"\n"
+"apt-helper es un ayudante interno de apt\n"
+"\n"
+"Órdenes:\n"
+" download-file - descarga la uri proporcionada a la ruta de destino\n"
+" auto-detect-proxy - detecta el proxy usando apt.conf\n"
+"\n"
+" Este Ayudante de APT tiene poderes de Super Llanto.\n"
-#: cmdline/apt-mark.cc:68
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:65
+#, c-format
msgid "%s can not be marked as it is not installed.\n"
-msgstr "pero no está instalado"
+msgstr "%s no se puede marcar como no instalado.\n"
-#: cmdline/apt-mark.cc:74
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:71
+#, c-format
msgid "%s was already set to manually installed.\n"
-msgstr "fijado %s como instalado manualmente.\n"
+msgstr "%s ya estaba fijado como instalado manualmente.\n"
-#: cmdline/apt-mark.cc:76
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:73
+#, c-format
msgid "%s was already set to automatically installed.\n"
-msgstr "fijado %s como instalado automáticamente.\n"
+msgstr "%s ya estaba fijado como instalado automáticamente.\n"
-#: cmdline/apt-mark.cc:241
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:238
+#, c-format
msgid "%s was already set on hold.\n"
-msgstr "%s ya está en su versión más reciente.\n"
+msgstr "%s ya estaba fijado como retenido.\n"
-#: cmdline/apt-mark.cc:243
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:240
+#, c-format
msgid "%s was already not hold.\n"
-msgstr "%s ya está en su versión más reciente.\n"
+msgstr "%s ya no estaba retenido.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
-msgstr "Esperaba %s pero no estaba allí"
+msgstr "Se esperaba %s pero no estaba presente"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
+#, c-format
msgid "%s set on hold.\n"
-msgstr "fijado %s como instalado manualmente.\n"
+msgstr "%s fijado como retenido.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
+#, c-format
msgid "Canceled hold on %s.\n"
-msgstr "No se pudo abrir %s"
+msgstr "Se ha cancelado la retención de %s.\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
-msgstr ""
+msgstr "Fallo al ejecutar dpkg. ¿Está como superusuario?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -789,6 +804,31 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
+"Uso: apt-mark [opciones] {auto|manual} paq1 [paq2 ...]\n"
+"\n"
+"apt-mark es una sencilla interfaz de línea de órdenes para marcar paquetes\n"
+"como instalados manualmente o automáticamente. También puede listar las "
+"marcas.\n"
+"\n"
+"Órdenes:\n"
+" auto - Marca los paquetes proporcionados como instalados automáticamente\n"
+" manual - Marca los paquetes proporcionados como instalados manualmente\n"
+" hold - Marca el paquete como retenido\n"
+" unhold - Desmarca un paquete marcado como retenido\n"
+" showauto - Muestra la lista de paquetes instalados automáticamente\n"
+" showmanual - Muestra la lista de paquetes instalados manualmente\n"
+" showhold - Muestra la lista de paquetes retenidos\n"
+"\n"
+"Opciones:\n"
+" -h Este texto de ayuda.\n"
+" -q Salida registrable - sin indicador de progreso\n"
+" -qq Sin salida, expceto si hay errores\n"
+" -s No actúa. Realiza una simulación.\n"
+" -f Lee y escribe la marca auto/manual en el fichero proporcionado\n"
+" -c=? Lee este fichero de configuración\n"
+" -o=? Establece una opción de configuración arbitraria, p. ej.\n"
+" -o dir::cache=/tmp\n"
+"Ver las páginas de manual de apt-mark(8) y apt.conf(5) para más información."
#: cmdline/apt.cc:47
msgid ""
@@ -811,19 +851,37 @@ msgid ""
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
+"Uso: apt [opciones] orden\n"
+"\n"
+"Interfaz de línea de órdenes (CLI) para apt.\n"
+"Órdenes básicas: \n"
+" list - lista los paquetes según los nombres\n"
+" search - busca en las descripciones de los paquetes\n"
+" show - muestra detalles del paquete\n"
+"\n"
+" update - actualiza la lista de paquetes disponibles\n"
+"\n"
+" install - instala paquetes\n"
+" remove - elimina paquetes\n"
+"\n"
+" upgrade - actualiza el sistema instalando/actualizando paquetes\n"
+" full-upgrade - actualiza el sistema eliminando/instalando/actualizando "
+"paquetes\n"
+"\n"
+" edit-sources - edita el fichero de información de fuentes\n"
#: methods/cdrom.cc:203
#, c-format
msgid "Unable to read the cdrom database %s"
-msgstr "No pude leer la base de datos %s del cdrom"
+msgstr "No se pudo leer la base de datos %s del cdrom"
#: methods/cdrom.cc:212
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, utilice «apt-cdrom» para hacer que APT reconozca este CD. No "
-"puede utilizar «apt-get update» para añadir nuevos CDs"
+"Utilice «apt-cdrom» para hacer que APT reconozca este CD. No puede utilizar "
+"«apt-get update» para añadir nuevos CDs"
#: methods/cdrom.cc:222
msgid "Wrong CD-ROM"
@@ -832,7 +890,7 @@ msgstr "CD equivocado"
#: methods/cdrom.cc:249
#, 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."
+msgstr "No se puede desmontar el CD-ROM de %s, tal vez aún se está utilizando."
#: methods/cdrom.cc:254
msgid "Disk not found."
@@ -845,43 +903,43 @@ msgstr "Fichero no encontrado"
#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
#: methods/rred.cc:608
msgid "Failed to stat"
-msgstr "No pude leer"
+msgstr "Fallo al leer"
#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
msgid "Failed to set modification time"
-msgstr "No pude poner el tiempo de modificación"
+msgstr "Fallo al establecer el tiempo de modificación"
#: methods/file.cc:48
msgid "Invalid URI, local URIS must not start with //"
-msgstr "URI inválido, los URIS locales no deben de empezar con //"
+msgstr "URI inválido, los URIS locales no deben empezar por //"
#. Login must be before getpeername otherwise dante won't work.
#: methods/ftp.cc:178
msgid "Logging in"
-msgstr "Entrando"
+msgstr "Ingresando"
#: methods/ftp.cc:184
msgid "Unable to determine the peer name"
-msgstr "No pude determinar el nombre del par"
+msgstr "No se pudo determinar el nombre del par"
#: methods/ftp.cc:189
msgid "Unable to determine the local name"
-msgstr "Imposible determinar el nombre local"
+msgstr "No se pudo determinar el nombre local"
#: methods/ftp.cc:220 methods/ftp.cc:248
#, c-format
msgid "The server refused the connection and said: %s"
-msgstr "El servidor rechazó nuestra conexión y dijo: %s"
+msgstr "El servidor rechazó la conexión y devolvió: %s"
#: methods/ftp.cc:226
#, c-format
msgid "USER failed, server said: %s"
-msgstr "Usuario (USER) falló, el servidor dijo: %s"
+msgstr "Usuario (USER) falló, el servidor devolvió: %s"
#: methods/ftp.cc:233
#, c-format
msgid "PASS failed, server said: %s"
-msgstr "Clave (PASS) falló, el servidor dijo: %s"
+msgstr "Clave (PASS) falló, el servidor devolvió: %s"
#: methods/ftp.cc:253
msgid ""
@@ -894,16 +952,16 @@ msgstr ""
#: methods/ftp.cc:281
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "Falló la orden «%s» del script de entrada, el servidor dijo: %s"
+msgstr "Falló la orden «%s» del script de entrada, el servidor devolvió: %s"
#: methods/ftp.cc:307
#, c-format
msgid "TYPE failed, server said: %s"
-msgstr "Tipo (TYPE) falló, el servidor dijo: %s"
+msgstr "Tipo (TYPE) falló, el servidor devolvió: %s"
#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
msgid "Connection timeout"
-msgstr "La conexión expiró"
+msgstr "Caducó la conexión"
#: methods/ftp.cc:351
msgid "Server closed the connection"
@@ -917,7 +975,7 @@ msgstr "Error de lectura"
#: methods/ftp.cc:361 methods/rsh.cc:209
msgid "A response overflowed the buffer."
-msgstr "No pude crear un socket."
+msgstr "La respuesta desbordó la memoria intermedia (buffer)."
#: methods/ftp.cc:378 methods/ftp.cc:390
msgid "Protocol corruption"
@@ -932,11 +990,11 @@ msgstr "Error de escritura"
#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
msgid "Could not create a socket"
-msgstr "No pude crear un socket"
+msgstr "No se pudo crear el socket"
#: methods/ftp.cc:713
msgid "Could not connect data socket, connection timed out"
-msgstr "No pude conectar el socket de datos, expiró el tiempo de conexión"
+msgstr "No se pudo conectar el socket de datos, caducó el tiempo de conexión"
#: methods/ftp.cc:717 methods/connect.cc:116
msgid "Failed"
@@ -944,63 +1002,63 @@ msgstr "Falló"
#: methods/ftp.cc:719
msgid "Could not connect passive socket."
-msgstr "No pude conectar un socket pasivo."
+msgstr "No se pudo conectar el socket pasivo."
#: methods/ftp.cc:736
msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo no pude obtener un socket oyente"
+msgstr "«getaddrinfo» no pudo obtener un socket pasivo"
#: methods/ftp.cc:750
msgid "Could not bind a socket"
-msgstr "No pude ligar un socket"
+msgstr "No se pudo asociar el socket"
#: methods/ftp.cc:754
msgid "Could not listen on the socket"
-msgstr "No pude escuchar en el socket"
+msgstr "No se pudo escuchar en el socket"
#: methods/ftp.cc:761
msgid "Could not determine the socket's name"
-msgstr "No pude determinar el nombre del socket"
+msgstr "No se pudo determinar el nombre del socket"
#: methods/ftp.cc:793
msgid "Unable to send PORT command"
-msgstr "No pude mandar la orden PORT"
+msgstr "No se pudo mandar la orden PORT"
#: methods/ftp.cc:803
#, c-format
msgid "Unknown address family %u (AF_*)"
-msgstr "Dirección de familia %u desconocida (AF_*)"
+msgstr "Familia de direcciones %u desconocida (AF_*)"
#: methods/ftp.cc:812
#, c-format
msgid "EPRT failed, server said: %s"
-msgstr "EPRT falló, el servidor dijo: %s"
+msgstr "EPRT falló, el servidor devolvió: %s"
#: methods/ftp.cc:832
msgid "Data socket connect timed out"
-msgstr "Expiró conexión a socket de datos"
+msgstr "Caducó conexión al socket de datos"
#: methods/ftp.cc:839
msgid "Unable to accept connection"
-msgstr "No pude aceptar la conexión"
+msgstr "No se pudo aceptar la conexión"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
-msgstr "Se produjo un problema al hacer un hash del archivo"
+msgstr "Problema al cifrar el fichero"
#: methods/ftp.cc:892
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr "Imposible traer archivo, el servidor dijo «%s»"
+msgstr "No se pudo obtener el fichero, el servidor devolvió «%s»"
#: methods/ftp.cc:907 methods/rsh.cc:338
msgid "Data socket timed out"
-msgstr "Expiró el socket de datos"
+msgstr "Caducó el socket de datos"
#: methods/ftp.cc:944
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr "Falló transferencia de datos, el servidor dijo «%s»"
+msgstr "Falló transferencia de datos, el servidor devolvió «%s»"
#. Get the files information
#: methods/ftp.cc:1027
@@ -1009,7 +1067,7 @@ msgstr "Consulta"
#: methods/ftp.cc:1141
msgid "Unable to invoke "
-msgstr "No pude invocar "
+msgstr "No se pudo invocar "
#: methods/connect.cc:76
#, c-format
@@ -1024,22 +1082,22 @@ msgstr "[IP: %s %s]"
#: methods/connect.cc:94
#, 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)"
+msgstr "No se pudo crear un socket para %s (f=%u t=%u p=%u)"
#: methods/connect.cc:100
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "No puedo iniciar la conexión a %s:%s (%s)."
+msgstr "No se puede iniciar la conexión a %s:%s (%s)."
#: methods/connect.cc:108
#, 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"
+msgstr "No se pudo conectar a %s:%s (%s), caducó el tiempo para conexión"
#: methods/connect.cc:126
#, c-format
msgid "Could not connect to %s:%s (%s)."
-msgstr "No pude conectarme a %s:%s (%s)."
+msgstr "No se pudo conectar a %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
@@ -1059,9 +1117,9 @@ msgid "Temporary failure resolving '%s'"
msgstr "Fallo temporal al resolver «%s»"
#: methods/connect.cc:209
-#, fuzzy, c-format
+#, c-format
msgid "System error resolving '%s:%s'"
-msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)"
+msgstr "Error de sistema al resolver «%s:%s»"
#: methods/connect.cc:211
#, c-format
@@ -1073,129 +1131,376 @@ msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "No se pudo conectar a %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
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:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Se encontró al menos una firma inválida."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"No se pudo ejecutar «apt-key» para verificar la firma (¿está instalado "
"gnupg?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
+"El fichero firmado en claro no es válido, «%s» obtenido (¿la red requiere "
+"autenticación?)"
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
-msgstr "Error desconocido ejecutando apt-key"
+msgstr "Error desconocido ejecutando «apt-key»"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
-msgstr "Las siguientes firms fueron inválidas:\n"
+msgstr "Las siguientes firmas no fueron válidas:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
-"Las firmas siguientes no se pudieron verificar porque su llave pública no "
+"Las firmas siguientes no se pudieron verificar porque su clave pública no "
"está disponible:\n"
#: methods/gzip.cc:79
msgid "Empty files can't be valid archives"
-msgstr ""
+msgstr "Los ficheros vacíos no pueden ser archivos válidos"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Error escribiendo al archivo"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Error leyendo del servidor, el lado remoto cerró la conexión."
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Error leyendo del servidor"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Error escribiendo a archivo"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Falló la selección"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
-msgstr "Expiró la conexión"
+msgstr "Caducó la conexión"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
-msgstr "Error escribiendo al archivo de salida"
+msgstr "Error escribiendo al fichero de salida"
#: methods/server.cc:52
msgid "Waiting for headers"
msgstr "Esperando las cabeceras"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
-msgstr "Mala línea de cabecera"
+msgstr "Línea de cabecera incorrecta"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "El servidor de http envió una cabecera de respuesta inválida"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "El servidor de http envió una cabecera de Content-Length inválida"
+msgstr "El servidor de http envió una cabecera de «Content-Length» inválida"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "El servidor de http envió una cabecera de Content-Range inválida"
+msgstr "El servidor de http envió una cabecera de «Content-Range» inválida"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
-msgstr "Éste servidor de http tiene el soporte de alcance roto"
+msgstr "Este servidor de http admite alcance roto"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Formato de fecha desconocido"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
-msgstr "Mala cabecera Data"
+msgstr "Datos de cabecera incorrectos"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
-msgstr "Fallo la conexión"
+msgstr "Falló la conexión"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Error interno"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Listando"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "Hay %i versión adicional. Utilice la opción «-a» para verla"
+msgstr[1] "Hay %i versiones adicionales. Utilice la opción «-a» para verlas"
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Corrigiendo dependencias..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " falló."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "No se pueden corregir las dependencias"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "No se puede minimizar el conjunto de actualización"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Listo"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Tal vez quiera ejecutar «apt-get -f install» para corregirlo."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependencias incumplidas. Pruebe de nuevo utilizando -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "desconocido"
+
+#: apt-private/private-output.cc:265
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[instalado, actualizable a: %s]"
+
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr "[instalado, local]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[instalado, autodesinstalable]"
+
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr "[instalado, automático]"
+
+#: apt-private/private-output.cc:274
+msgid "[installed]"
+msgstr "[instalado]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[actualizable desde: %s]"
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr "[configuración-residual]"
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "pero %s está instalado"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "pero %s va a ser instalado"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "pero no es instalable"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "pero es un paquete virtual"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "pero no está instalado"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "pero no va a instalarse"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " o"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Se instalarán los siguientes paquetes NUEVOS:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Los siguientes paquetes se ELIMINARÁN:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Los siguientes paquetes se han retenido:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Se actualizarán los siguientes paquetes:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Se DESACTUALIZARÁN los siguientes paquetes:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Se cambiarán los siguientes paquetes retenidos:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (por %s) "
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ATENCIÓN: Se van a eliminar los siguientes paquetes esenciales.\n"
+"¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu actualizados, %lu nuevos se instalarán, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalados, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu desactualizados, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu para eliminar y %lu no actualizados.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu no instalados del todo o eliminados.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Error de compilación de expresiones regulares - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "La orden de actualización no necesita argumentos"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"Se puede actualizar %i paquete. Ejecute «apt list --upgradable» para verlo.\n"
+msgstr[1] ""
+"Se pueden actualizar %i paquetes. Ejecute «apt list --upgradable» para "
+"verlos.\n"
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr "Todos los paquetes están actualizados."
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
+msgstr "Ordenando"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "Hay %i registro adicional. Utilice la opción «-a» para verlo."
+msgstr[1] "Hay %i registros adicionales. Utilice la opción «-a» para verlos."
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "no es un paquete real (virtual)"
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
msgstr ""
+"NOTA: ¡Esto es sólo una simulación!\n"
+" apt-get necesita privilegios de administrador para la ejecución real.\n"
+" Tenga también en cuenta que se han desactivado los bloqueos,\n"
+" ¡no dependa la situación real actual de la relevancia de esto!"
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
@@ -1204,7 +1509,7 @@ msgstr "Error interno, ¡se llamó a «InstallPackages» con paquetes rotos!"
#: apt-private/private-install.cc:90
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-"Los paquetes necesitan eliminarse pero está deshabilitado la posibilidad de "
+"Se necesita eliminar paquetes, pero está desactivada la posibilidad de "
"eliminar."
#: apt-private/private-install.cc:109
@@ -1213,9 +1518,7 @@ msgstr "Error interno, no terminó la ordenación"
#: apt-private/private-install.cc:147
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Qué raro... Los tamaños no concuerdan, mande un correo a apt@packages.debian."
-"org"
+msgstr "Los tamaños no concuerdan, mande un correo a apt@packages.debian.org"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
@@ -1229,7 +1532,7 @@ msgstr "Se necesita descargar %sB/%sB de archivos.\n"
#: apt-private/private-install.cc:159
#, c-format
msgid "Need to get %sB of archives.\n"
-msgstr "Necesito descargar %sB de archivos.\n"
+msgstr "Se necesita descargar %sB de archivos.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
@@ -1252,7 +1555,7 @@ msgstr "Hay problemas y se utilizó -y sin --force-yes"
#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Se especificó Trivial Only pero ésta no es una operación trivial."
+msgstr "Se especificó «Trivial Only» pero esta no es una operación trivial."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
@@ -1273,7 +1576,7 @@ msgstr ""
#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
msgid "Abort."
-msgstr "Abortado."
+msgstr "Anulado."
#: apt-private/private-install.cc:218
msgid "Do you want to continue?"
@@ -1293,7 +1596,7 @@ msgstr ""
#: apt-private/private-install.cc:299
msgid "--fix-missing and media swapping is not currently supported"
-msgstr "Actualmente no están soportados --fix-missing e intercambio de medio"
+msgstr "Actualmente no se admite --fix-missing ni intercambio de medio"
#: apt-private/private-install.cc:304
msgid "Unable to correct missing packages."
@@ -1301,7 +1604,7 @@ msgstr "No se pudieron corregir los paquetes que faltan."
#: apt-private/private-install.cc:305
msgid "Aborting install."
-msgstr "Abortando la instalación."
+msgstr "Anulando la instalación."
#: apt-private/private-install.cc:341
msgid ""
@@ -1312,10 +1615,10 @@ msgid_plural ""
"all files have been overwritten by other packages:"
msgstr[0] ""
"El paquete mostrado a continuación ha desaparecido de su sistema\n"
-"dado que todos sus ficheros han sido sobreescritos por otros paquetes:"
+"dado que otros paquetes han sobreescrito todos sus paquetes:"
msgstr[1] ""
"Los paquetes mostrados a continuación han desaparecido de su sistema\n"
-"dado que todos sus ficheros han sido sobreescritos por otros paquetes:"
+"dado que otros paquetes han sobreescrito todos sus paquetes:"
#: apt-private/private-install.cc:345
msgid "Note: This is done automatically and on purpose by dpkg."
@@ -1324,15 +1627,15 @@ msgstr "Nota: Dpkg realiza esto de forma automática y a propósito."
#: apt-private/private-install.cc:366
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»"
+"Se supone que no se van a eliminar cosas, no se puede iniciar «AutoRemover»"
#: apt-private/private-install.cc:474
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."
+"Parece que «AutoRemover» destruyó algo y eso no debería haber pasado.\n"
+"Envíe un informe de errores al programa apt."
#.
#. if (Packages == 1)
@@ -1360,7 +1663,7 @@ msgid_plural ""
"required:"
msgstr[0] ""
"El paquete indicado a continuación se instaló de forma automática y ya no es "
-"necesarios."
+"necesario."
msgstr[1] ""
"Los paquetes indicados a continuación se instalaron de forma automática y ya "
"no son necesarios."
@@ -1370,15 +1673,14 @@ msgstr[1] ""
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "Se instaló de forma automática %lu paquete y ya no es necesario.\n"
+msgstr[0] "Se instaló %lu paquete de forma automática y ya no es necesario.\n"
msgstr[1] ""
-"Se instalaron de forma automática %lu paquetes y ya no son necesarios.\n"
+"Se instalaron %lu paquetes de forma automática y ya no son necesarios.\n"
#: apt-private/private-install.cc:494
-#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Utilice «apt-get autoremove» para eliminarlos."
+msgstr[0] "Utilice «apt-get autoremove» para eliminarlo."
msgstr[1] "Utilice «apt-get autoremove» para eliminarlos."
#: apt-private/private-install.cc:587
@@ -1402,8 +1704,8 @@ msgid ""
msgstr ""
"No se pudieron instalar algunos paquetes. Esto puede significar que\n"
"usted pidió una situación imposible o, si está usando la distribución\n"
-"inestable, que algunos paquetes necesarios no han sido creados o han\n"
-"sido movidos fuera de Incoming."
+"inestable, que algunos paquetes necesarios aún no se han creado o se\n"
+"han sacado de «Incoming»."
#: apt-private/private-install.cc:633
msgid "Broken packages"
@@ -1424,19 +1726,19 @@ msgstr "Paquetes recomendados:"
#: apt-private/private-install.cc:823
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Ignorando %s, ya está instalado y no está activada la actualización.\n"
+msgstr "Omitiendo %s, ya está instalado y no está activada la actualización.\n"
#: apt-private/private-install.cc:827
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
-"Ignorando %s, no está instalado y sólo se están solicitando "
+"Omitiendo %s, no está instalado y solo se están solicitando "
"actualizaciones.\n"
#: apt-private/private-install.cc:839
#, 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"
+msgstr "No es posible reinstalar el paquete %s, no se pudo descargar.\n"
#: apt-private/private-install.cc:844
#, c-format
@@ -1449,265 +1751,21 @@ msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Versión seleccionada «%s» (%s) para «%s»\n"
#: apt-private/private-install.cc:897
-#, fuzzy, c-format
+#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Versión seleccionada «%s» (%s) para «%s»\n"
+msgstr "Versión seleccionada «%s» (%s) para «%s» debido a «%s»\n"
#. TRANSLATORS: Note, this is not an interactive question
#: apt-private/private-install.cc:939
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "El paquete %s no está instalado, no se eliminará\n"
-
-#: apt-private/private-install.cc:945
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "El paquete %s no está instalado, no se eliminará\n"
-
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Corrigiendo dependencias..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " falló."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "No se puede corregir las dependencias"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "No se puede minimizar el conjunto de actualización"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Listo"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Tal vez quiera ejecutar «apt-get -f install» para corregirlo."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "pero %s está instalado"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "pero %s va a ser instalado"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "pero no es instalable"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "pero es un paquete virtual"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "pero no está instalado"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "pero no va a instalarse"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " o"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Se instalarán los siguientes paquetes NUEVOS:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Los siguientes paquetes se ELIMINARÁN:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Los siguientes paquetes se han retenido:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Se actualizarán los siguientes paquetes:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Se DESACTUALIZARÁN los siguientes paquetes:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Se cambiarán los siguientes paquetes retenidos:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (por %s) "
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"AVISO: Se van a eliminar los siguientes paquetes esenciales.\n"
-"¡NO debe hacerse a menos que sepa exactamente lo que está haciendo!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu actualizados, %lu se instalarán, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalados, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu desactualizados, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu para eliminar y %lu no actualizados.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu no instalados del todo o eliminados.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Error de compilación de expresiones regulares - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "El comando de actualización no toma argumentos"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
+"El paquete «%s» no está instalado, no se eliminará. ¿Quiso decir «%s»?\n"
-#: apt-private/private-show.cc:156
+#: apt-private/private-install.cc:945
#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"NOTA: ¡Esto es sólo una simulación\n"
-" apt-get necesita privilegios de administrador para la ejecución real.\n"
-" Tenga también en cuenta que se han desactivado los bloqueos,\n"
-" ¡no dependa de la relevancia a la situación real actual!"
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "El paquete «%s» no está instalado, no se eliminará\n"
#: apt-private/private-download.cc:62
#, c-format
@@ -1718,7 +1776,7 @@ msgstr ""
#: apt-private/private-download.cc:94
msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "AVISO: ¡No se han podido autenticar los siguientes paquetes!"
+msgstr "ATENCIÓN: ¡No se han podido autenticar los siguientes paquetes!"
#: apt-private/private-download.cc:98
msgid "Authentication warning overridden.\n"
@@ -1735,12 +1793,12 @@ msgstr "¿Instalar estos paquetes sin verificación?"
#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
-msgstr "Imposible obtener %s %s\n"
+msgstr "Fallo al obtener %s %s\n"
#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "No pude determinar el espacio libre en %s"
+msgstr "No se pudo determinar el espacio libre en %s"
#: apt-private/private-download.cc:188
#, c-format
@@ -1748,34 +1806,38 @@ msgid "You don't have enough free space in %s."
msgstr "No tiene suficiente espacio libre en %s."
#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
+#, c-format
msgid "Failed to parse %s. Edit again? "
-msgstr "No pude abrir %s.new"
+msgstr "Fallo al tratar %s. ¿Editar de nuevo?"
#: apt-private/private-sources.cc:70
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
+msgstr "El fichero «%s» cambió, ejecute «apt-get update»."
#: apt-private/private-search.cc:69
msgid "Full Text Search"
-msgstr ""
+msgstr "Buscar en todo el texto"
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Obj "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Obj:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Des:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Des:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1794,24 +1856,24 @@ msgid ""
" '%s'\n"
"in the drive '%s' and press enter\n"
msgstr ""
-"Cambio de medio: Por favor, inserte el disco etiquetado como\n"
+"Cambio de medio: Inserte el disco etiquetado como\n"
" «%s»\n"
"en la unidad «%s» y pulse Intro\n"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
-msgstr "No pude leer %s"
+msgstr "No se pudo leer %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1822,19 +1884,19 @@ msgstr "No se pudo cambiar a %s"
#: methods/mirror.cc:280
#, c-format
msgid "No mirror file '%s' found "
-msgstr "No se encontró un archivo de réplica «%s»"
+msgstr "No se encontró el archivo de réplica «%s»"
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
#: methods/mirror.cc:287
-#, fuzzy, c-format
+#, c-format
msgid "Can not read mirror file '%s'"
-msgstr "No se encontró un archivo de réplica «%s»"
+msgstr "No se puede leer el archivo de réplica «%s»"
#: methods/mirror.cc:315
-#, fuzzy, c-format
+#, c-format
msgid "No entry found in mirror file '%s'"
-msgstr "No se encontró un archivo de réplica «%s»"
+msgstr "No se encontró ninguna entrada en el archivo de réplica «%s»"
#: methods/mirror.cc:445
#, c-format
@@ -1843,7 +1905,7 @@ msgstr "[Réplica: %s]"
#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
msgid "Failed to create IPC pipe to subprocess"
-msgstr "Falló la creación de una tubería IPC para el subproceso"
+msgstr "Fallo al crear una tubería IPC para el subproceso"
#: methods/rsh.cc:346
msgid "Connection closed prematurely"
@@ -1851,7 +1913,7 @@ msgstr "La conexión se cerró prematuramente"
#: dselect/install:33
msgid "Bad default setting!"
-msgstr "¡Parámetro por omisión incorrecto!"
+msgstr "¡Parámetro predeterminado incorrecto!"
#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95
#: dselect/install:106 dselect/update:45
@@ -1882,14 +1944,14 @@ msgstr ""
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
-"encima de este mensaje son importantes. Por favor, corríjalas y ejecute "
-"«[I]nstall» otra vez"
+"encima de este mensaje son importantes. Corríjalas y ejecute «[I]nstall» "
+"otra vez"
#: dselect/update:30
msgid "Merging available information"
msgstr "Fusionando información disponible"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1914,46 +1976,46 @@ msgstr ""
" -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::"
"cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
-#, fuzzy, c-format
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, c-format
msgid "Unable to mkstemp %s"
msgstr "No pude leer %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
-msgstr "No se puede escribir en %s"
+msgstr "No se pudo escribir en %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
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:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "La lista de extensión de paquetes es demasiado larga"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Error procesando el directorio %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "La lista de extensión de fuentes es demasiado larga"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Error escribiendo cabeceras de archivos de contenido"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Error procesando contenidos %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -2038,11 +2100,11 @@ msgstr ""
" -c=? Lee este archivo de configuración\n"
" -o=? Establece una opción de configuración arbitraria"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Ninguna selección coincide"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, 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»"
@@ -2074,10 +2136,9 @@ msgstr "No se pudo abrir el archivo DB %s: %s"
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
-msgstr "No pude leer %s"
+msgstr "Fallo al leer %s"
#: ftparchive/cachedb.cc:326
-#, fuzzy
msgid "Failed to read .dsc"
msgstr "No se pudo leer el enlace %s"
@@ -2154,22 +2215,22 @@ msgstr " DeLink se ha llegado al límite de %sB.\n"
msgid "Archive had no package field"
msgstr "Archivo no tiene campo de paquetes"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s no tiene entrada de predominio\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " el encargado de %s es %s y no %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s no tiene una entrada fuente predominante\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampoco tiene una entrada binaria predominante\n"
@@ -2186,29 +2247,29 @@ msgstr "No se pudo abrir %s"
#. skip spaces
#. find end of word
#: ftparchive/override.cc:68
-#, fuzzy, c-format
+#, c-format
msgid "Malformed override %s line %llu (%s)"
-msgstr "Predominio mal formado %s línea %lu #1"
+msgstr "Predominio mal formado %s línea %llu (%s)"
#: 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"
+msgstr "No se pudo leer el fichero de predominio %s"
#: ftparchive/override.cc:166
-#, fuzzy, c-format
+#, c-format
msgid "Malformed override %s line %llu #1"
-msgstr "Predominio mal formado %s línea %lu #1"
+msgstr "Predominio mal formado %s línea %llu #1"
#: ftparchive/override.cc:178
-#, fuzzy, c-format
+#, c-format
msgid "Malformed override %s line %llu #2"
-msgstr "Predominio mal formado %s línea %lu #2"
+msgstr "Predominio mal formado %s línea %llu #2"
#: ftparchive/override.cc:191
-#, fuzzy, c-format
+#, c-format
msgid "Malformed override %s line %llu #3"
-msgstr "Predominio mal formado %s línea %lu #3"
+msgstr "Predominio mal formado %s línea %llu #3"
#: ftparchive/multicompress.cc:73
#, c-format
@@ -2253,10 +2314,9 @@ msgstr "Se produjo un problema al desligar %s"
#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
#, c-format
msgid "Failed to rename %s to %s"
-msgstr "Falló el renombre de %s a %s"
+msgstr "Fallo al renombrar %s a %s"
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2281,11 +2341,11 @@ msgstr ""
" -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::"
"cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "¡Registro de paquete desconocido!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2313,7 +2373,7 @@ msgstr ""
#: apt-pkg/install-progress.cc:59
#, c-format
msgid "Progress: [%3i%%]"
-msgstr ""
+msgstr "Progreso: [%3i%%]"
#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
msgid "Running dpkg"
@@ -2322,7 +2382,7 @@ msgstr "Ejecutando dpkg"
#: apt-pkg/init.cc:156
#, c-format
msgid "Packaging system '%s' is not supported"
-msgstr "No está soportado el sistema de paquetes «%s»"
+msgstr "No se admite el sistema de paquetes «%s»"
#: apt-pkg/init.cc:172
msgid "Unable to determine a suitable packaging system type"
@@ -2336,12 +2396,12 @@ msgstr "%i registros escritos.\n"
#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
#, c-format
msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i registros escritos con %i fichero de menos.\n"
+msgstr "%i registros escritos con %i ficheros de menos.\n"
#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i registros escritos con %i fichero mal emparejado\n"
+msgstr "%i registros escritos con %i ficheros mal emparejados\n"
#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
#, c-format
@@ -2359,6 +2419,26 @@ msgstr "No se pudo encontrar un registro de autenticación para: %s"
msgid "Hash mismatch for: %s"
msgstr "La suma hash difiere para: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, 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:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "¿Está instalado el paquete %s?"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "El método %s no se inició correctamente"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Inserte el disco con etiqueta «%s» en la unidad «%s» y pulse Intro."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2367,182 +2447,308 @@ msgstr ""
#: apt-pkg/cachefile.cc:98
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"
+msgstr "Tal vez deba ejecutar «apt-get update» para corregir estos problemas"
#: apt-pkg/cachefile.cc:116
msgid "The list of sources could not be read."
msgstr "No se pudieron leer las listas de fuentes."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Caché de paquetes vacía."
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
-msgstr "El archivo de caché de paquetes está dañado"
+msgstr "El fichero de caché de paquetes está dañado"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
-msgstr "El archivo de caché de paquetes es una versión incompatible"
+msgstr "El fichero de caché de paquetes es una versión incompatible"
-#: apt-pkg/pkgcache.cc:163
-#, fuzzy
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
-msgstr "El archivo de caché de paquetes está dañado"
+msgstr "El fichero de caché de paquetes está dañado, es demasiado pequeño"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
-msgstr "Esta versión de APT no soporta el sistema de versiones «%s»"
+msgstr "Esta versión de APT no admite el sistema de versiones «%s»"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "La caché de paquetes se había creado para una arquitectura diferente"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Depende"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "PreDepende"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Sugiere"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Recomienda"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Entra en conflicto"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Reemplaza"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Hace obsoleto"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Rompe"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Mejora"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "importante"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "requiere"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "estándar"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "opcional"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "extra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Calculando la actualización"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "No se pudo encontrar el método %s."
+msgid "Index file type '%s' is not supported"
+msgstr "El tipo de fichero de índice «%s» no se admite"
-#: apt-pkg/acquire-worker.cc:135
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
+#: apt-pkg/sourcelist.cc:127
+#, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Línea %u mal formada en la lista de fuentes %s (análisis de URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "El método %s no se inició correctamente"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Línea %lu mal formada en la lista de fuentes %s ([opción] no analizable)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, 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 pulse Intro."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+"Línea %lu mal formada en la lista de fuentes %s ([opción] demasiado corta)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "No se da soporte para el tipo de archivo de índice «%s»"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+"Línea %lu mal formada en la lista de fuentes %s ([%s] no es una asignación)"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Creando árbol de dependencias"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+"Línea %lu mal formada en la lista de fuentes %s (no hay clave para [%s])"
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versiones candidatas"
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Línea %lu mal formada en la lista de fuentes %s ([%s] la clave %s no tiene "
+"asociado un valor)"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generación de dependencias"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Línea %lu mal formada en la lista de fuentes %s (URI)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Leyendo la información de estado"
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Línea %lu mal formada en la lista de fuentes %s (dist)"
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "No se pudo abrir el fichero de estado %s"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:217
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falló la escritura del fichero de estado temporal %s"
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Línea %lu mal formada en la lista de fuentes %s (dist absoluta)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de dist)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Abriendo %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, 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:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)"
+
+#: apt-pkg/sourcelist.cc:375
+#, 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 la lista de fuentes %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tipo «%s» desconocido en el bloque %u de la lista de fuentes %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr "No se admite la limpieza de «%s»"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "No se pudo leer %s."
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "La caché tiene una versión incompatible de sistema de versiones"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Se produjo un error mientras se procesaba %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Excedió la cantidad de nombres de paquetes que admite este APT."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Excedió la cantidad de versiones que admite este APT."
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Excedió la cantidad de descripciones que admite este APT."
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Excedió la cantidad de dependencias que admite este APT."
+
+#: apt-pkg/pkgcachegen.cc:591
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+"No se encontró el paquete %s %s mientras se procesaban las dependencias"
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "No se pudo leer la lista de paquetes fuente %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Leyendo lista de paquetes"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Recogiendo archivos que proveen"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Error de E/S al guardar la caché fuente"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Enviar situación al solucionador"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Enviar petición al solucionador"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Preparar para recibir una solución"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "Falló solucionador externo sin un mensaje de error apropiado"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "Ejecutar solucionador externo"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "falló el cambio de nombre, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "La suma hash difiere"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "El tamaño difiere"
-#: apt-pkg/acquire-item.cc:255
-#, fuzzy
+#: apt-pkg/acquire-item.cc:250
msgid "Invalid file format"
-msgstr "Operación inválida: %s"
+msgstr "Formato inválido de fichero"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Error de escritura"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2553,7 +2759,7 @@ msgstr ""
"GPG es: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "Error de GPG: %s: %s"
@@ -2569,51 +2775,55 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
+"No se pudo encontrar la entrada esperada «%s» en el archivo "
+"«Release» (entrada incorrecta en «sources.list» o fichero mal formado)"
-#: apt-pkg/acquire-item.cc:1971
-#, fuzzy, c-format
+#: apt-pkg/acquire-item.cc:1975
+#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "No se pudo leer el archivo «Release» %s"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
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:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
+"El archivo «Release» para %s está caducado (inválido desde %s). No se "
+"aplicará ninguna actualización de este repositorio."
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2623,12 +2833,13 @@ msgstr ""
"que necesita arreglar manualmente este paquete (debido a que falta una "
"arquitectura)"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
+"No se puede encontrar una fuente para descargar la versión «%s» de «%s»"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2636,141 +2847,68 @@ msgstr ""
"Los archivos de índice de paquetes están dañados. No existe un campo "
"«Filename:» para el paquete %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "La caché tiene una versión incompatible de sistema de versiones"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Se produjo un error mientras se procesaba %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:273
-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:276
-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:279
-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:282
-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:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-"Al procesar las dependencias de archivos no se encontró el paquete %s %s"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, 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:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Leyendo lista de paquetes"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Recogiendo archivos que proveen"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Error de E/S guardando caché fuente"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Bloque de fabricante %s sin huella digital"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Falta el directorio de listas %spartial."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Falta el directorio de archivos %spartial."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "No se da soporte para el tipo de archivo de índice «%s»"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "No se pudo bloquear el directorio %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Descargando fichero %li de %li (falta %s)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Descargando fichero %li de %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"No se han podido descargar algunos archivos de índice, se han ignorado, o se "
-"ha utilizado unos antiguos en su lugar."
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Debe poner algunos URIs fuente («source») en su sources.list"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "No se pudo leer %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
"The value '%s' is invalid for APT::Default-Release as such a release is not "
"available in the sources"
msgstr ""
+"El valor «%s» no es válido para APT::Default-Release ya que dicha "
+"distribución no está disponible en las fuentes"
#: apt-pkg/policy.cc:422
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
-"Registro inválido en el archivo de preferencias %s, no hay cabecera «Package»"
+"Registro inválido en el archivo de preferencias %s, no tiene cabecera "
+"«Package»"
#: apt-pkg/policy.cc:444
#, c-format
msgid "Did not understand pin type %s"
-msgstr "No se entiende el pin tipo %s"
+msgstr "No se entendió el pin tipo %s"
#: apt-pkg/policy.cc:452
msgid "No priority (or zero) specified for pin"
msgstr "No hay prioridad especificada para pin (o es cero)"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2780,27 +2918,30 @@ msgstr ""
"de manual con «man 5 apt.conf» bajo «APT::Immediate-Configure» para más "
"información. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
-#, fuzzy, c-format
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
+#, c-format
msgid "Could not configure '%s'. "
-msgstr "No pude abrir el fichero «%s»"
+msgstr "No se pudo configurar «%s»"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, 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 ejecución de la instalación requiere eliminar temporalmente el paquete "
-"esencial %s debido a un bucle de Conflictos/Pre-Dependencias. Esto "
-"generalmente es malo, pero si realmente quiere hacerlo, active la opción |"
-"APT::Force-LoopBreak»."
+"Esta ejecución de la instalación requiere eliminar temporalmente el paquete "
+"esencial %s debido a un bucle de Conflictos/Pre-Dependencias. Normalmente "
+"esto es malo, pero si quiere hacerlo de todas formas, active la opción |APT::"
+"Force-LoopBreak»."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, 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/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"No se han podido descargar algunos archivos de índice, se han omitido, o se "
+"han utilizado unos antiguos en su lugar."
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2809,7 +2950,7 @@ msgstr "Desmontando el CD-ROM...\n"
#: apt-pkg/cdrom.cc:586
#, c-format
msgid "Using CD-ROM mount point %s\n"
-msgstr "Usando el punto de montaje del CD-ROM %s\n"
+msgstr "Usando el punto de montaje %s del CD-ROM\n"
#: apt-pkg/cdrom.cc:599
msgid "Waiting for disc...\n"
@@ -2830,7 +2971,7 @@ msgstr "Etiqueta guardada: %s \n"
#: apt-pkg/cdrom.cc:680
msgid "Scanning disc for index files...\n"
-msgstr "Buscando en el disco archivos de índices...\n"
+msgstr "Buscando en el disco ficheros de índices...\n"
#: apt-pkg/cdrom.cc:734
#, c-format
@@ -2846,8 +2987,8 @@ msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-"No pude localizar ningún archivo de paquete, ¿quizás este no sea un disco de "
-"Debian o sea de otra arquitectura?"
+"No se pudo localizar ningún archivo de paquete, ¿quizás este no sea un disco "
+"de Debian o sea de otra arquitectura?"
#: apt-pkg/cdrom.cc:771
#, c-format
@@ -2871,11 +3012,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Copiando las listas de paquetes..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
-msgstr "Escribiendo nueva lista de fuente\n"
+msgstr "Escribiendo nueva lista de fuentes\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Las entradas de la lista de fuentes para este disco son:\n"
@@ -2884,212 +3025,107 @@ msgstr "Las entradas de la lista de fuentes para este disco son:\n"
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-"El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para "
-"éste."
+"El paquete %s necesita ser reinstalado, pero no se encuentra el archivo para "
+"ello."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-"Error, pkgProblemResolver::Resolve generó cortes, esto puede haber sido "
-"causado por paquetes retenidos."
+"Error, pkgProblemResolver::Resolve generó cortes, esto puede deberse a "
+"paquetes retenidos."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"No se pudieron corregir los problemas, usted ha retenido paquetes rotos."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, 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:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "No se pudo tratar el archivo de paquetes %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "No se pudo leer el archivo «Release» %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "No se encontraron secciones en el archivo «Release» %s"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "No existe una entrada «Hash» en el archivo «Release» %s"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Entrada «Valid-Until» inválida en el archivo «Release» %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Entrada «Date» inválida en el archivo «Release» %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Línea %lu mal formada en la lista de fuentes %s ([opción] no parseable)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Línea %lu mal formada en la lista de fuentes %s ([opción] demasiado corta)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Línea %lu mal formada en la lista de fuentes %s ([%s] no es una asignación)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Línea %lu mal formada en la lista de fuentes %s (no hay clave para [%s])"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Línea %lu mal formada en la lista de fuentes %s ([%s] la clave %s no tiene "
-"asociado un valor)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Línea %lu mal formada en la lista de fuentes %s (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Línea %lu mal formada en la lista de fuentes %s (dist)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Creando árbol de dependencias"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de URI)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versiones candidatas"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Línea %lu mal formada en la lista de fuentes %s (dist absoluta)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generación de dependencias"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Línea %lu mal formada en la lista de fuentes %s (análisis de dist)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Leyendo la información de estado"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "Abriendo %s"
+msgid "Failed to open StateFile %s"
+msgstr "No se pudo abrir el fichero de estado %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falló la escritura del fichero de estado temporal %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, 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:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Tipo «%s» desconocido en la línea %u de lista de fuentes %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "No se pudo tratar el archivo de paquetes %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
msgid "Release '%s' for '%s' was not found"
-msgstr "No se encontró la Distribución «%s» para «%s»"
+msgstr "No se encontró la distribución «%s» para «%s»"
#: apt-pkg/cacheset.cc:504
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "No se encontró la versión «%s» para «%s»"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "No se pudo encontrar la tarea «%s»"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
-#: apt-pkg/cacheset.cc:646
-#, fuzzy, c-format
+#: apt-pkg/cacheset.cc:641
+#, c-format
msgid "Couldn't find any package by glob '%s'"
-msgstr "No se pudo encontrar ningún paquete con la expresión regular «%s»"
+msgstr "No se pudo encontrar ningún paquete usando «*» con «%s»"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"No se pueden seleccionar distintas versiones del paquete «%s» porque es "
"puramente virtual"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"No se puede seleccionar la última versión del paquete «%s» dado que es "
"puramente virtual"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-"No se puede seleccionar una versión candidata del paquete %s dado que no "
+"No se puede seleccionar la versión candidata del paquete %s dado que no "
"tiene candidatos"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-"No se puede seleccionar una versión instalada del paquete «%s» puesto que no "
+"No se puede seleccionar la versión instalada del paquete «%s» puesto que no "
"está instalado"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3098,188 +3134,64 @@ msgstr ""
"No se puede seleccionar una versión instalada o candidata para el paquete "
"«%s» dado que éste no tiene ninguna de éstas"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Instalando %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Configurando %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Eliminando %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "Borrando completamente %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Se detectó la desaparición de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Ejecutando disparador post-instalación %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Falta el directorio «%s»."
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "No pude abrir el fichero «%s»"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Preparando %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Unpacking %s"
-msgstr "Desempaquetando %s"
+msgid "Unable to parse Release file %s"
+msgstr "No se pudo leer el archivo «Release» %s"
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Preparing to configure %s"
-msgstr "Preparándose para configurar %s"
+msgid "No sections in Release file %s"
+msgstr "No se encontraron secciones en el archivo «Release» %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Installed %s"
-msgstr "%s instalado"
+msgid "No Hash entry in Release file %s"
+msgstr "No existe una entrada «Hash» en el archivo «Release» %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Preparándose para eliminar %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Entrada «Valid-Until» inválida en el archivo «Release» %s"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Removed %s"
-msgstr "%s eliminado"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Entrada «Date» inválida en el archivo «Release» %s"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Preparándose para eliminar completamente %s"
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Completely removed %s"
-msgstr "Se borró completamente %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "No se puede escribir en %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-"No se escribió ningún informe «apport» porque ya se ha alcanzado el valor de "
-"«MaxReports»"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "problemas de dependencias - dejando sin instalar"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"No se escribió un informe «apport» porque el mensaje de error indica que es "
-"un mensaje de error asociado a un fallo previo."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"No se escribió un informe «apport» porque el mensaje de error indica que el "
-"error es de disco lleno"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"No se escribió un informe «apport» porque el mensaje de error indica un "
-"error de memoria excedida"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"No se escribió un informe «apport» porque el mensaje de error indica que el "
-"error es de disco lleno"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"No se escribió un informe «apport» porque el mensaje de error indica un "
-"error de E/S de dpkg"
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"No se pudo bloquear el directorio de administración (%s), ¿quizás haya algún "
-"otro proceso utilizándolo?"
+msgid "%limin %lis"
+msgstr "%limin %lis"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "No se encontró un archivo de réplica «%s»"
+msgid "%lis"
+msgstr "%lis"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"se interrumpió la ejecución de dpkg, debe ejecutar manualmente «%s» para "
-"corregir el problema"
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "No bloqueado"
+msgid "Selection %s not found"
+msgstr "Selección %s no encontrada"
#: apt-pkg/contrib/fileutl.cc:196
#, 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"
+msgstr "No se utilizan bloqueos para el fichero de bloqueo de sólo lectura %s"
#: apt-pkg/contrib/fileutl.cc:201
#, c-format
@@ -3300,22 +3212,27 @@ msgstr "No se pudo bloquear %s"
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
msgstr ""
+"La lista de los ficheros no se pudo crear, ya que «%s» no es un directorio"
#: apt-pkg/contrib/fileutl.cc:400
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgstr "Omitiendo «%s» del directorio «%s», ya que no es un fichero regular"
#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
msgstr ""
+"Omitiendo fichero «%s» del directorio «%s», ya que no tiene extensión de "
+"nombre de fichero"
#: apt-pkg/contrib/fileutl.cc:427
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
+"Omitiendo el fichero «%s» del directorio «%s», ya que tiene una extensión de "
+"nombre de fichero no válida"
#: apt-pkg/contrib/fileutl.cc:846
#, c-format
@@ -3361,14 +3278,14 @@ msgid "Failed to exec compressor "
msgstr "No se pudo ejecutar el compresor "
#: apt-pkg/contrib/fileutl.cc:1553
-#, fuzzy, c-format
+#, c-format
msgid "read, still have %llu to read but none left"
-msgstr "leídos, todavía debía leer %lu pero no queda nada"
+msgstr "leídos, todavía quedaban por leer %llu pero no queda ninguna"
#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
-#, fuzzy, c-format
+#, c-format
msgid "write, still have %llu to write but couldn't"
-msgstr "escritos, todavía tenía que escribir %lu pero no pude hacerlo"
+msgstr "escritos, todavía quedaban por escribir %llu pero no se pudo hacer"
#: apt-pkg/contrib/fileutl.cc:1954
#, c-format
@@ -3401,42 +3318,13 @@ msgstr "%c%s... Hecho"
#: apt-pkg/contrib/progress.cc:181
msgid "..."
-msgstr ""
+msgstr "..."
#. Print the spinner
#: apt-pkg/contrib/progress.cc:197
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Hecho"
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin. %liseg."
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin. %liseg."
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin. %liseg."
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%liseg."
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Selección %s no encontrada"
+msgid "%c%s... %u%%"
+msgstr "%c%s... %u%%"
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
@@ -3448,9 +3336,9 @@ msgid "Couldn't duplicate file descriptor %i"
msgstr "No pude duplicar el descriptor de fichero %i"
#: apt-pkg/contrib/mmap.cc:119
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't make mmap of %llu bytes"
-msgstr "No pude hacer mmap de %lu bytes"
+msgstr "No se puede hacer mmap de %llu bytes"
#: apt-pkg/contrib/mmap.cc:146
msgid "Unable to close mmap"
@@ -3503,124 +3391,298 @@ msgstr "No se puede obtener información del punto de montaje %s"
msgid "Failed to stat the cdrom"
msgstr "No pude montar el cdrom"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Tipo de abreviación no reconocida: «%c»"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Abriendo fichero de configuración %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, 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:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Error de sintaxis %s:%u: Marca mal formada"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, 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:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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 en el primer "
"nivel"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, 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:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Error de sintaxis %s:%u: Incluido desde aquí"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, 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:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Error de sintaxis %s:%u: la directiva «clear» tiene que incluir un árbol de "
"opciones como argumento"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, 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/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, 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:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, 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:171
+#: apt-pkg/contrib/cmndline.cc:174
#, 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:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "La opción %s necesita un argumento."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
"Opción %s: La especificación del elemento de configuración debe tener un "
"=<val>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, 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:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Opción «%s» demasiado larga"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, 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:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Operación inválida: %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Instalando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Configurando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Eliminando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "Borrando completamente %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Se detectó la desaparición de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Ejecutando disparador post-instalación %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Falta el directorio «%s»."
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "No se pudo abrir el fichero «%s»"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Preparando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Desempaquetando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Preparándose para configurar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "%s instalado"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Preparándose para eliminar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "%s eliminado"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Preparándose para eliminar completamente %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s se borró completamente"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, c-format
+msgid "Can not write log (%s)"
+msgstr "No se pudo escribir el informe (%s)"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr "¿Está montado «/dev/pts»?"
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "Se interrumpió la operación antes de que pudiera terminar"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+"No se escribió ningún informe «apport» porque ya se ha alcanzado el valor de "
+"«MaxReports»"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "problemas de dependencias - dejando sin configurar"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"No se escribió un informe «apport» porque el mensaje de error indica que es "
+"un mensaje de error asociado a un fallo previo."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"No se escribió un informe «apport» porque el mensaje de error indica que el "
+"error es de disco lleno"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"No se escribió un informe «apport» porque el mensaje de error indica un "
+"error de memoria excedida"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"No se escribió un informe «apport» porque el mensaje de error indica un "
+"problema en el sistema local"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"No se escribió un informe «apport» porque el mensaje de error indica un "
+"error de E/S de dpkg"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"No se pudo bloquear el directorio de administración (%s), ¿quizás haya algún "
+"otro proceso utilizándolo?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+"No se pudo bloquear el directorio de administración (%s), ¿está como "
+"superusuario?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"se interrumpió la ejecución de dpkg, debe ejecutar manualmente «%s» para "
+"corregir el problema"
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "No bloqueado"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
-msgstr "DropNode llamado en un nodo todavía ligado"
+msgstr "DropNode llamado en un nodo todavía conectado"
#: apt-inst/filelist.cc:412
msgid "Failed to locate the hash element!"
-msgstr "¡No pude localizar el elemento enlazado!"
+msgstr "¡Fallo al localizar el elemento enlazado!"
#: apt-inst/filelist.cc:459
msgid "Failed to allocate diversion"
-msgstr "No pude asignar una desviación"
+msgstr "Fallo al asignar una desviación"
#: apt-inst/filelist.cc:464
msgid "Internal error in AddDiversion"
@@ -3629,7 +3691,7 @@ msgstr "Error interno en AddDiversion"
#: 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"
+msgstr "Intentando sobreescribir una desviación, %s -> %s y %s/%s"
#: apt-inst/filelist.cc:506
#, c-format
@@ -3639,7 +3701,7 @@ msgstr "Doble suma de desviación %s -> %s"
#: apt-inst/filelist.cc:549
#, c-format
msgid "Duplicate conf file %s/%s"
-msgstr "Archivo de configuración duplicado %s/%s"
+msgstr "Fichero de configuración duplicado %s/%s"
#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
#, c-format
@@ -3659,24 +3721,24 @@ msgstr "El directorio %s está desviado"
#: apt-inst/extract.cc:152
#, 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"
+msgstr "El paquete está tratando de escribir al objetivo desviado %s/%s"
#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
msgid "The diversion path is too long"
-msgstr "La trayectoria de desviación es demasiado larga"
+msgstr "La ruta de la desviación es demasiado larga"
#: apt-inst/extract.cc:249
#, c-format
msgid "The directory %s is being replaced by a non-directory"
-msgstr "El directorio %s está siendo reemplazado por un no-directorio"
+msgstr "Se está reemplazando el directorio %s por un no-directorio"
#: apt-inst/extract.cc:289
msgid "Failed to locate node in its hash bucket"
-msgstr "No pude localizar el nodo en su bote de enlace"
+msgstr "Fallo al localizar el nodo en su posición en el hash"
#: apt-inst/extract.cc:293
msgid "The path is too long"
-msgstr "La trayectoria es muy larga"
+msgstr "La ruta es demasiado larga"
#: apt-inst/extract.cc:421
#, c-format
@@ -3691,17 +3753,17 @@ msgstr "El archivo %s/%s sobreescribe al que está en el paquete %s"
#: apt-inst/extract.cc:498
#, c-format
msgid "Unable to stat %s"
-msgstr "No pude leer %s"
+msgstr "No se pudo leer %s"
#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
#, c-format
msgid "Failed to write file %s"
-msgstr "Falló la escritura del archivo %s"
+msgstr "Fallo al escribir el archivo %s"
#: apt-inst/dirstream.cc:104
#, c-format
msgid "Failed to close file %s"
-msgstr "No pude cerrar el archivo %s"
+msgstr "Fallo al cerrar el archivo %s"
#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
#: apt-inst/deb/debfile.cc:63
@@ -3712,9 +3774,9 @@ msgstr "Este no es un archivo DEB válido, falta el miembro «%s»"
#: apt-inst/deb/debfile.cc:132
#, c-format
msgid "Internal error, could not locate member %s"
-msgstr "Error interno, no pude localizar el miembro %s"
+msgstr "Error interno, no se pudo localizar el miembro %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Archivo de control inanalizable"
@@ -3741,26 +3803,26 @@ msgstr "El archivo es muy pequeño"
#: apt-inst/contrib/arfile.cc:141
msgid "Failed to read the archive headers"
-msgstr "No pude leer las cabeceras del archivo"
+msgstr "Fallo al leer las cabeceras del archivo"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
-msgstr "No pude crear las tuberías"
+msgstr "Fallo al crear las tuberías"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
-msgstr "No pude ejecutar gzip"
+msgstr "Fallo al ejecutar gzip"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Archivo dañado"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr ""
-"Se produjo un fallo al calcular la suma de control de tar, archive dañado"
+"Se produjo un fallo al calcular la suma de control de tar, archivo dañado"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Cabecera del TAR tipo %u desconocida, miembro %s"
@@ -3777,6 +3839,9 @@ msgstr "Cabecera del TAR tipo %u desconocida, miembro %s"
#~ msgid "No keyring installed in %s."
#~ msgstr "No se instaló ningún anillo de claves %s."
+#~ msgid "Is stdout a terminal?"
+#~ msgstr "¿Es «stdout» una terminal?"
+
#, fuzzy
#~ msgid "Internal error, Upgrade broke stuff"
#~ msgstr "Error Interno, AllUpgrade rompió cosas"
diff --git a/po/eu.po b/po/eu.po
index e84be37a1..f1e90411a 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_eu\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2009-05-17 00:41+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -23,148 +23,148 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "%s paketeak (%s bertsioa) mendekotasun arazo bat du:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Pakete Izenak Guztira : "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid "Total package structures: "
msgstr "Pakete Izenak Guztira : "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Pakete normalak:"
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Pakete birtual puruak:"
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Bakanako pakete birtualak: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Nahastutako pakete birtualak: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Falta direnak: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Bertsio Ezberdinak Guztira: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Azalpen Ezberdinak Guztira: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Dependentziak Guztira: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Guztira Bertsio/fitxategi erlazioak: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Fitx/Azalpen erlazioak guztira: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Guztira Saltzaile Mapatzea: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Guztira bateratutako kateak: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Guztira galdutako tokia:"
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Guztira erregistratutako lekua: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "%s pakete fitxategia ez dago sinkronizatuta."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Ez da paketerik aurkitu"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
#, fuzzy
msgid "You must give at least one search pattern"
msgstr "Zehazki eredu bat eman behar duzu."
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Ezin da %s paketea lokalizatu"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Pakete Fitxategiak:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
"Katxea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin "
"pakete fitxategi bati"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Pin duten Paketeak:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(ez da aurkitu)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Instalatuta: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Hautagaia: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(bat ere ez)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Paketearen pin-a:"
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Bertsio taula:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -236,22 +236,22 @@ msgstr ""
" -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:76
+#: cmdline/apt-cdrom.cc:77
#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
"Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Mesedez sar diska bat gailuan eta enter sakatu"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Huts egin du %s izenaren ordez %s ipintzean"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -259,7 +259,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Prozesu hau bildumako beste CD guztiekin errepikatu."
@@ -295,83 +295,78 @@ msgstr ""
" -c=? Irakurri konfigurazio fitxategi hau\n"
" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s eskuz instalatua bezala ezarri.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s eskuz instalatua bezala ezarri.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Ezin da zerrenda direktorioa blokeatu"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Ezin da deskarga direktorioa blokeatu"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -379,96 +374,96 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Eskuratu %s iturburua\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Huts egin du zenbat artxibo lortzean."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Deskarga amaituta eta deskarga soileko moduan"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, 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:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Prozesu umeak huts egin du"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s: ez du eraikitze mendekotasunik.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -476,7 +471,7 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -484,14 +479,14 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, 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:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -500,7 +495,7 @@ 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:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -508,17 +503,17 @@ msgid ""
msgstr ""
"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, 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:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
@@ -627,11 +622,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -645,52 +640,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "baina ez dago instalatuta"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s eskuz instalatua bezala ezarri.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s eskuz instalatua bezala ezarri.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s bertsiorik berriena da jada.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s bertsiorik berriena da jada.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s espero zen baina ez zegoen han"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "%s eskuz instalatua bezala ezarri.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "Huts egin du %s irekitzean"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -915,7 +911,7 @@ msgstr "Datu-socket konexioak denbora muga gainditu du"
msgid "Unable to accept connection"
msgstr "Ezin da konexioa onartu"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Arazoa fitxategiaren hash egitean"
@@ -1005,37 +1001,38 @@ msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
msgid "Unable to connect to %s:%s:"
msgstr "Ezin da konektatu -> %s %s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
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:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Beintza sinadura baliogabe bat aurkitu da."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
+#, fuzzy
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
-"Ezin da apt-key abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)"
+"Ezin da %s abiarazi sinadura egiaztatzeko (gnupg instalaturik al dago?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Errore ezezaguna apt-key exekutatzean"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Ondorengo sinadurak baliogabeak dira:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1047,31 +1044,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Errorea zerbitzaritik irakurtzean"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Hautapenak huts egin du"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Konexioaren denbora muga gainditu da"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Errorea irteerako fitxategian idaztean"
@@ -1079,53 +1076,294 @@ msgstr "Errorea irteerako fitxategian idaztean"
msgid "Waiting for headers"
msgstr "Goiburuen zain"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Okerreko goiburu-lerroa"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "http zerbitzariak erantzun goiburu baliogabe bat bidali du."
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "http zerbitzariak barruti onarpena apurturik du"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Datu formatu ezezaguna"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Goiburu data gaizki dago"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Konexioak huts egin du"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Barne errorea"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Mendekotasunak zuzentzen..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " : huts egin du."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Ezin dira mendekotasunak zuzendu"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Ezin da bertsio berritzeko multzoa minimizatu"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Eginda"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu zuzentzeko."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalatuta]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalatuta]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalatuta]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalatuta]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "baina %s instalatuta dago"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "baina %s instalatzeko dago"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "baina ez da instalagarria"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "baina pakete birtuala da"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "baina ez dago instalatuta"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "baina ez da instalatuko"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " edo"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Ondorengo paketeak KENDUKO dira:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Ondorengo paketeak mantendu egin dira:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Ondorengo paketeak bertsio-berrituko dira:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (arrazoia: %s) "
+
+#: apt-private/private-output.cc:696
+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 horrelakorik egin, ez badakizu ondo zertan ari zaren!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu berrinstalatuta, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu aurreko bertsiora itzulita, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ez erabat instalatuta edo kenduta.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[B/e]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[b/E]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Adierazpen erregularren konpilazio errorea - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
@@ -1387,247 +1625,6 @@ msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
msgid "Package '%s' is not installed, so not removed\n"
msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Mendekotasunak zuzentzen..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " : huts egin du."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Ezin dira mendekotasunak zuzendu"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Ezin da bertsio berritzeko multzoa minimizatu"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Eginda"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Beharbada 'apt-get -f install' exekutatu nahiko duzu zuzentzeko."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalatuta]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalatuta]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalatuta]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalatuta]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "baina %s instalatuta dago"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "baina %s instalatzeko dago"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "baina ez da instalagarria"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "baina pakete birtuala da"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "baina ez dago instalatuta"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "baina ez da instalatuko"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " edo"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Ondorengo paketeak KENDUKO dira:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Ondorengo paketeak mantendu egin dira:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Ondorengo paketeak bertsio-berrituko dira:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (arrazoia: %s) "
-
-#: apt-private/private-output.cc:696
-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 horrelakorik egin, ez badakizu ondo zertan ari zaren!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu bertsio berritua(k), %lu berriki instalatuta, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu berrinstalatuta, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu aurreko bertsiora itzulita, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ez erabat instalatuta edo kenduta.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[B/e]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[b/E]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Adierazpen erregularren konpilazio errorea - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1681,20 +1678,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Atzituta "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Atzituta:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Hartu:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Hartu:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ez ikusi "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ez ikusi:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1720,17 +1721,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Ezin da %s irakurri"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1806,7 +1807,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Eskuragarrien datuak biltzen"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1830,46 +1831,46 @@ msgstr ""
" -c=? Irakurri konfigurazio fitxategi hau\n"
" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Ezin da daturik lortu %s(e)tik"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "%s : ezin da idatzi"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Pakete luzapenen zerrenda luzeegia da"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Errorea direktorioa prozesatzean %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Iturburu luzapenen zerrenda luzeegia da"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Errorea eduki fitxategiaren goiburua idaztean"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Errorea edukiak prozesatzean %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1948,11 +1949,11 @@ msgstr ""
" -c=? Irakurri konfigurazio fitxategi hau\n"
" -o=? Ezarri konfigurazio aukera arbitrario bat"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Ez dago bat datorren hautapenik"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Fitxategi batzuk falta dira `%s' pakete fitxategien taldean"
@@ -2065,22 +2066,22 @@ msgstr " DeLink-en mugara (%sB) heldu da.\n"
msgid "Archive had no package field"
msgstr "Artxiboak ez du pakete eremurik"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s: ez du override sarrerarik\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s mantentzailea %s da, eta ez %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s: ez du jatorri gainidazketa sarrerarik\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s: ez du bitar gainidazketa sarrerarik\n"
@@ -2166,7 +2167,7 @@ msgstr "Arazoa %s desestekatzean"
msgid "Failed to rename %s to %s"
msgstr "Huts egin du %s izenaren ordez %s ipintzean"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2191,11 +2192,11 @@ msgstr ""
" -c=? Irakurri konfigurazio fitxategi hau\n"
" -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Pakete erregistro ezezaguna!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2268,6 +2269,26 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Egiaztapena ez dator bat"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu."
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "%s metodoa ez da behar bezala abiarazi"
+
+#: apt-pkg/acquire-worker.cc:485
+#, 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/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "Pakete zerrenda edo egoera fitxategia ezin dira analizatu edo ireki."
@@ -2280,176 +2301,297 @@ msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko"
msgid "The list of sources could not be read."
msgstr "Ezin izan da Iturburu zerrenda irakurri."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Paketeen katxea hutsik"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Paketeen katxe fitxategia hondatuta dago"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Paketeen katxe fixategiaren bertsioa ez da bateragarria"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "Paketeen katxe fitxategia hondatuta dago"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, 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:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Paketeen katxea beste arkitektura batentzat sortuta dago"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Mendekotasuna:"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Aurremendekotasuna:"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Iradokizuna:"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Gomendioa:"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Gatazka:"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Ordeztea:"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Zaharkitzea:"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Apurturik"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "garrantzitsua"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "beharrezkoa"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "estandarra"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "aukerakoa"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "estra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Berriketak kalkulatzen"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu."
+msgid "Index file type '%s' is not supported"
+msgstr "'%s' motako indize fitxategirik ez da onartzen"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
+
+#: apt-pkg/sourcelist.cc:206
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s metodoa ez da behar bezala abiarazi"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:208
#, 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"
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)"
+
+#: apt-pkg/sourcelist.cc:217
+#, 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:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s irekitzen"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
+
+#: apt-pkg/sourcelist.cc:375
+#, 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"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "'%s' motako indize fitxategirik ez da onartzen"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Dependentzia zuhaitza eraikitzen"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ezin da %s atzitu."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Hautagaien bertsioak"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Katxearen bertsio sistema ez da bateragarria"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Dependentzi Sormena"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Egoera argibideak irakurtzen"
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "APT honek maneia dezakeen pakete izenen kopurua gainditu duzu."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "APT honek maneia dezakeen bertsio kopurua gainditu duzu."
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:279
+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:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "APT honek maneia dezakeen mendekotasun muga gainditu duzu."
+
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Huts egin du %s EgoeraFitxategia irekitzean"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "%s %s paketea ez da aurkitu fitxategi mendekotasunak prozesatzean"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi"
+msgid "Couldn't stat source package list %s"
+msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Pakete Zerrenda irakurtzen"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Fitxategiaren erreferentziak biltzen"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "S/I errorea iturburu katxea gordetzean"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Egiaztapena ez dator bat"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Tamaina ez dator bat"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Eragiketa baliogabea: %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Idazketa errorea"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2457,7 +2599,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
@@ -2473,49 +2615,49 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2524,12 +2666,12 @@ msgstr ""
"Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
"beharko duzu paketea. (arkitektura falta delako)"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2537,113 +2679,42 @@ msgstr ""
"Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
"paketearentzat."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Katxearen bertsio sistema ez da bateragarria"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "APT honek maneia dezakeen pakete izenen kopurua gainditu duzu."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "APT honek maneia dezakeen bertsio kopurua gainditu duzu."
-
-#: apt-pkg/pkgcachegen.cc:279
-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:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "APT honek maneia dezakeen mendekotasun muga gainditu duzu."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "%s %s paketea ez da aurkitu fitxategi mendekotasunak prozesatzean"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Pakete Zerrenda irakurtzen"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Fitxategiaren erreferentziak biltzen"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "S/I errorea iturburu katxea gordetzean"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "%s saltzaile blokeak ez du egiaztapen markarik"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "%spartial zerrenda-direktorioa falta da."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "%spartial artxibo direktorioa falta da."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "'%s' motako indize fitxategirik ez da onartzen"
+msgid "Unable to lock directory %s"
+msgstr "Ezin da zerrenda direktorioa blokeatu"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "%li fitxategi deskargatzen %li -tik (%s falta da)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "%li fitxategia jasotzen %li-tik"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-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/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "'Iturburu' URI batzuk jarri behar dituzu sources.list-en"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ezin da %s atzitu."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2665,19 +2736,19 @@ msgstr "Ez da ulertu %s orratz-mota (pin)"
msgid "No priority (or zero) specified for pin"
msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "%s fitxategia ezin izan da ireki"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2689,10 +2760,14 @@ msgstr ""
"izaten da, baina hala ere egin nahi baduzu, aktibatu APT::Force-LoopBreak "
"aukera."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+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/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2761,11 +2836,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Pakete zerrendak kopiatzen..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Jatorri zerrenda berria idazten\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Diskoarentzako jatorri sarrerak:\n"
@@ -2776,7 +2851,7 @@ msgid ""
msgstr ""
"%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2784,139 +2859,40 @@ msgstr ""
"Errorea: pkgProblemResolver::Resolve. Etenak sortu ditu, beharbada "
"atxikitako paketeek eraginda."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Ezin da %s pakete fitxategia analizatu (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-
-#: apt-pkg/indexrecords.cc:91
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:152
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Lerro baliogabea desbideratze fitxategian: %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)"
-
-#: apt-pkg/sourcelist.cc:170
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-
-#: apt-pkg/sourcelist.cc:173
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-
-#: apt-pkg/sourcelist.cc:190
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-
-#: apt-pkg/sourcelist.cc:193
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Dependentzia zuhaitza eraikitzen"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Hautagaien bertsioak"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Dependentzi Sormena"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Egoera argibideak irakurtzen"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "%s irekitzen"
+msgid "Failed to open StateFile %s"
+msgstr "Huts egin du %s EgoeraFitxategia irekitzean"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Ezin izan da %s aldiroko EgoeraFitrxategia idatzi"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, 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"
-
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Ezin da %s pakete fitxategia analizatu (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2928,208 +2904,101 @@ msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu"
msgid "Version '%s' for '%s' was not found"
msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Ezin izan da %s zeregina aurkitu"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Ezin izan da %s paketea aurkitu"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Ezin izan da %s paketea aurkitu"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "%s Instalatzen"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "%s konfiguratzen"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "%s kentzen"
+#: apt-pkg/indexrecords.cc:83
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/indexrecords.cc:91
#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "%s guztiz ezabatu da"
+msgid "No sections in Release file %s"
+msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
-#: apt-pkg/deb/dpkgpm.cc:111
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Noting disappearance of %s"
+msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "'%s' direktorioa falta da"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/indexrecords.cc:145
#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "%s fitxategia ezin izan da ireki"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "%s prestatzen"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "%s irekitzen"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "%s konfiguratzeko prestatzen"
-
-#: apt-pkg/deb/dpkgpm.cc:1012
-#, c-format
-msgid "Installed %s"
-msgstr "%s Instalatuta"
-
-#: apt-pkg/deb/dpkgpm.cc:1017
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr "%s kentzeko prestatzen"
-
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, c-format
-msgid "Removed %s"
-msgstr "%s kendurik"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "%s guztiz ezabatzeko prestatzen"
-
-#: apt-pkg/deb/dpkgpm.cc:1025
-#, c-format
-msgid "Completely removed %s"
-msgstr "%s guztiz ezabatu da"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Lerro baliogabea desbideratze fitxategian: %s"
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
+#: apt-pkg/indexrecords.cc:164
#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "%s : ezin da idatzi"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ezin da %s pakete fitxategia analizatu (1)"
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
+#, c-format
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Ezin da zerrenda direktorioa blokeatu"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "%lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
+msgstr "%s hautapena ez da aurkitu"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3267,35 +3136,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Eginda"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "%s hautapena ez da aurkitu"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Ezin da fitxategi huts baten mmap egin"
@@ -3359,108 +3199,264 @@ msgstr "Ezin da atzitu %s muntatze puntua"
msgid "Failed to stat the cdrom"
msgstr "Huts egin du CDROMa atzitzean"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Mota ezezaguneko laburtzapena: '%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "%s konfigurazio fitxategia irekitzen"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Sintaxi errorea, %s:%u: Blokearen hasieran ez dago izenik."
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Sintaxi errorea %s:%u: Gaizki eratutako"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria balioaren ondoren"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Sintaxi errorea, %s:%u: habiaratutako elementu gehiegi"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Sintaxi errorea, %s:%u: hemendik barne hartuta"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Sintaxi errorea, %s:%u: onartu gabeko '%s' direktiba"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, fuzzy, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "Sintaxi errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria fitxategi amaieran"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Ez da ezagutzen komando lerroko '%c' aukera [%s]."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Ez da ulertzen komando lerroko %s aukera"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Komando lerroko %s aukera ez da boolearra."
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "%s aukerak argumentu bat behar du."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
"%s aukera: konfigurazio elementuaren zehaztapenak =<val> eduki behar du."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, 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:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "'%s' aukera luzeegia da"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, 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:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Eragiketa baliogabea: %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "%s Instalatzen"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "%s konfiguratzen"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "%s kentzen"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "%s guztiz ezabatu da"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Inbstalazio-ondorengo %s abiarazlea exekutatzen"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "'%s' direktorioa falta da"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "%s fitxategia ezin izan da ireki"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "%s prestatzen"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "%s irekitzen"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "%s konfiguratzeko prestatzen"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "%s Instalatuta"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "%s kentzeko prestatzen"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "%s kendurik"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "%s guztiz ezabatzeko prestatzen"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s guztiz ezabatu da"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "%s : ezin da idatzi"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Ezin da zerrenda direktorioa blokeatu"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "DropNode-ri dei egin zaio oraindik estekatutako nodoan"
@@ -3565,7 +3561,7 @@ msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da"
msgid "Internal error, could not locate member %s"
msgstr "Barne Errorea, ezin da %s atala kokatu"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Kontrol fitxategi ezin analizagarria"
@@ -3594,23 +3590,23 @@ msgstr "Artxiboa laburregia da"
msgid "Failed to read the archive headers"
msgstr "Huts egin artxibo goiburuak irakurtzean"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Huts egin du kanalizazioak sortzean"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Huts egin du gzip exekutatzean "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Hondatutako artxiboa"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "%u TAR goiburu mota ezezaguna, %s kidea"
diff --git a/po/fi.po b/po/fi.po
index f68aaa864..c40ed8e9e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2008-12-11 14:52+0200\n"
"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -23,146 +23,146 @@ msgstr ""
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:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Pakettien kokonaismäärä : "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid "Total package structures: "
msgstr "Pakettien kokonaismäärä : "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Tavallisia paketteja: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Aitoja näennäispaketteja: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Yksinkertaisia näennäispaketteja: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Sekanäennäispaketteja: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Puuttuu: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Eri versioita yhteensä: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Eri kuvauksia yhteensä: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Riippuvuuksia yhteensä: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Versio/tdsto suhteita yht: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Kuvaus/tdsto suhteita yht: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Tarjoamiskuvauksia yhteensä: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Erilaisia merkkijonoja yhteensä: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Löysää tilaa yhteensä: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Käytetty tila yhteensä: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakettitiedosto %s ei ole ajan tasalla."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Yhtään pakettia ei löytynyt"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
#, fuzzy
msgid "You must give at least one search pattern"
msgstr "On annettava täsmälleen yksi lauseke"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Pakettia %s ei löydy"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Pakettitiedostot:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "Varasto ei ole ajan tasalla, pakettitiedostoa ei löydy kansiosta"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Paketit joissa tunniste:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(ei löydy)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Asennettu: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Ehdokas: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(ei mitään)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Paketin tunnistenumero: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Versiotaulukko:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s laitealustalle %s käännöksen päiväys %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -234,21 +234,21 @@ msgstr ""
" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
"Lisätietoja apt-cache(8) ja apt.conf(5) käsikirjasivuilla.\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Kirjoita levylle nimi, kuten \"Debian 2.1r1 Levy 1\""
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Aseta levy asemaan ja paina Enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -256,7 +256,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Toista tämä lopuille rompuille kasassasi."
@@ -292,83 +292,78 @@ msgstr ""
" -c=? Lue tämä asetustiedosto\n"
" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "stat ei toiminut lähdepakettiluettelolle %s"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Sisäinen virhe, resolver rikkoi jotain"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Luettelokansiota ei voitu lukita"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Noutokansiota ei saatu lukittua"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
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:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -376,95 +371,95 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "On noudettava %st lähdekoodiarkistoja.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Nouda lähdekoodi %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Nouto on valmis ja määrätty vain nouto"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, 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:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Purkukomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Lapsiprosessi kaatui"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -472,7 +467,7 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -480,14 +475,14 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, 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:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -496,7 +491,7 @@ msgstr ""
"%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
"ei vastaa versioriippuvuuksia"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -504,17 +499,17 @@ msgid ""
msgstr ""
"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
@@ -622,11 +617,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -640,52 +635,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "mutta ei ole asennettu"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s on jo uusin versio.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s on jo uusin versio.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Odotettiin %s, mutta sitä ei ollut"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "Tiedoston %s avaaminen ei onnistunut"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -906,7 +902,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin"
msgid "Unable to accept connection"
msgstr "Yhteyttä ei voitu hyväksyä"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Pulmia tiedoston hajautuksessa"
@@ -995,39 +991,39 @@ msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
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:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
+#, fuzzy
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
-"Ei käynnistynyt \"apt-key\" allekirjoitusta tarkistamaan (onko gnupg "
-"asennettu?)"
+"Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gnupg asennettu?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Tapahtui tuntematon virhe suoritettaessa apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1039,31 +1035,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Tapahtui virhe luettaessa palvelimelta"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Select ei toiminut"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Yhteys aikakatkaistiin"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
@@ -1071,53 +1067,294 @@ msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
msgid "Waiting for headers"
msgstr "Odotetaan otsikoita"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Virheellinen otsikkorivi"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "HTTP-palvelimen arvoaluetuki on rikki"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Tuntematon päiväysmuoto"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Virheellinen otsikkotieto"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Yhteys ei toiminut"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Sisäinen virhe"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Korjataan riippuvuuksia..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " ei onnistunut."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Riippuvuuksien korjaus ei onnistu"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Päivitysjoukon minimointi ei onnistu"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Valmis"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Asennettu]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Asennettu]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Asennettu]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Asennettu]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "mutta %s on asennettu"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mutta %s on merkitty asennettavaksi"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "mutta ei ole asennuskelpoinen"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "mutta on näennäispaketti"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "mutta ei ole asennettu"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "mutta ei ole merkitty asennettavaksi"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " tai"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Seuraavat UUDET paketit asennetaan:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Seuraavat paketit POISTETAAN:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Nämä paketit on jätetty odottamaan:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Nämä paketit päivitetään:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Nämä paketit VARHENNETAAN:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Seuraavat pysytetyt paketit muutetaan:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (syynä %s) "
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu päivitetty, %lu uutta asennusta, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu uudelleen asennettua, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu varhennettua, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[K/e]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "K"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Käännösvirhe lausekkeessa - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Komento update ei käytä parametreja"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Sisäinen virhe, InstallPackages kutsuttiin rikkinäisille paketeille!"
@@ -1379,247 +1616,6 @@ msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Korjataan riippuvuuksia..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " ei onnistunut."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Riippuvuuksien korjaus ei onnistu"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Päivitysjoukon minimointi ei onnistu"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Valmis"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Halunnet suorittaa \"apt-get -f install\" korjaamaan nämä."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Asennettu]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Asennettu]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Asennettu]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Asennettu]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "mutta %s on asennettu"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mutta %s on merkitty asennettavaksi"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "mutta ei ole asennuskelpoinen"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "mutta on näennäispaketti"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "mutta ei ole asennettu"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "mutta ei ole merkitty asennettavaksi"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " tai"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Seuraavat UUDET paketit asennetaan:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Seuraavat paketit POISTETAAN:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Nämä paketit on jätetty odottamaan:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Nämä paketit päivitetään:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Nämä paketit VARHENNETAAN:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Seuraavat pysytetyt paketit muutetaan:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (syynä %s) "
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu päivitetty, %lu uutta asennusta, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu uudelleen asennettua, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu varhennettua, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[K/e]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "K"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Käännösvirhe lausekkeessa - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Komento update ei käytä parametreja"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1673,20 +1669,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Löytyi "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Löytyi:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Nouda:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Nouda:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Siv "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Siv:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Vrhe "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Vrhe:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1712,17 +1712,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Tiedostoa %s ei voi lukea"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1799,7 +1799,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Yhdistetään saatavuustiedot"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1823,47 +1823,47 @@ msgstr ""
" -c=? Lue tämä asetustiedosto\n"
" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Tiedostolle %s ei toimi stat"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ohjelman debconf versiota ei saa selvitettyä. Onko debconf asennettu?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Paketin laajennuslista on liian pitkä"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Tapahtui virhe käsiteltäessa kansiota %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Lähteiden laajennuslista on liian pitkä"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr ""
"Tapahtui virhe kirjoitettaessa otsikkotietoa sisällysluettelotiedostoon"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Tapahtui virhe käsiteltäessä sisällysluetteloa %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1945,11 +1945,11 @@ msgstr ""
" -c=? Lue tämä asetustiedosto\n"
" -o=? Aseta mikä asetusvalitsin tahansa"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Mitkään valinnat eivät täsmänneet"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Pakettitiedostojen ryhmästä \"%s\" puuttuu joitain tiedostoja"
@@ -2062,22 +2062,22 @@ msgstr " DeLinkin yläraja %st saavutettu.\n"
msgid "Archive had no package field"
msgstr "Arkistossa ei ollut pakettikenttää"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s:llä ei ole poikkeustietuetta\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s ylläpitäjä on %s eikä %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s:llä ei ole poikkeustietuetta\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n"
@@ -2163,7 +2163,7 @@ msgstr "Ilmeni pulmia poistettaessa tiedosto %s"
msgid "Failed to rename %s to %s"
msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2188,11 +2188,11 @@ msgstr ""
" -c=? Lue tämä asetustiedosto\n"
" -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Tuntematon pakettitietue!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2266,6 +2266,26 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Kohteen %s tarkistussumma ei täsmää"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Menetelmän ajuria %s ei löytynyt"
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Menetelmä %s ei käynnistynyt oikein"
+
+#: apt-pkg/acquire-worker.cc:485
+#, 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/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2279,176 +2299,298 @@ msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi"
msgid "The list of sources could not be read."
msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Pakettivarasto on tyhjä"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Pakettivarasto on turmeltunut"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Pakettivaraston versio on yhteensopimaton"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "Pakettivarasto on turmeltunut"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, 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:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Pakettivarasto on tehty muulle arkkitehtuurille"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Riippuvuudet"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Esiriippuvuudet"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Ehdotukset"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Suosittelut"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Ristiriidat"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Korvaavuudet"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Täydet korvaavuudet"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Rikkoo"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "tärkeä"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "välttämätön"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "perus"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "valinnainen"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "ylimääräinen"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Käsitellään päivitystä"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Menetelmän ajuria %s ei löytynyt"
+msgid "Index file type '%s' is not supported"
+msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
+
+#: apt-pkg/sourcelist.cc:206
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Menetelmä %s ei käynnistynyt oikein"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:208
#, 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."
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Index file type '%s' is not supported"
+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:217
+#, 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:224
+#, 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:335
+#, c-format
+msgid "Opening %s"
+msgstr "Avataan %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Rivi %u on liian pitkä lähdeluettelossa %s."
+
+#: apt-pkg/sourcelist.cc:371
+#, 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:375
+#, 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:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Muodostetaan riippuvuussuhteiden puu"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "stat %s ei onnistu."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Mahdolliset versiot"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Luodaan riippuvuudet"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Luetaan tilatiedot"
+#: apt-pkg/pkgcachegen.cc:273
+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:276
+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/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:279
+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:282
+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:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Tilatiedoston %s avaaminen ei onnistunut"
+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/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut"
+msgid "Couldn't stat source package list %s"
+msgstr "stat ei toiminut lähdepakettiluettelolle %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Luetaan pakettiluetteloita"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Kootaan tiedostojen tarjoamistietoja"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Tarkistussumma ei täsmää"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Koko ei täsmää"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Virheellinen toiminto %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Virhe kirjoitettaessa"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2456,7 +2598,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
@@ -2472,49 +2614,49 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
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:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2523,12 +2665,12 @@ 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:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2536,114 +2678,42 @@ msgstr ""
"Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
"kenttää."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:273
-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:276
-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:279
-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:282
-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:591
-#, 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:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "stat ei toiminut lähdepakettiluettelolle %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Luetaan pakettiluetteloita"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Kootaan tiedostojen tarjoamistietoja"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Toimittajan lohkosta %s puuttuu sormenjälki"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Luettelokansio %spartial puuttuu."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Arkistokansio %spartial puuttuu."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Hakemistotiedoston tyyppi \"%s\" ei ole tuettu"
+msgid "Unable to lock directory %s"
+msgstr "Luettelokansiota ei voitu lukita"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Noudetaan tiedosto %li / %li (jäljellä %s)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Noudetaan tiedosto %li / %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-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/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "stat %s ei onnistu."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2665,19 +2735,19 @@ msgstr "Tunnistetyyppi %s on tuntematon"
msgid "No priority (or zero) specified for pin"
msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "Tiedostoa %s ei voitu avata"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2688,10 +2758,14 @@ 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/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Rivi %u on liian pitkä lähdeluettelossa %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+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/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2760,11 +2834,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Kopioidaan pakettiluetteloita..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Kirjoitetaan uusi lähdeluettelo\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Tämän levyn lähdekoodipakettien luettelon tietueita ovat:\n"
@@ -2774,7 +2848,7 @@ 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:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2782,139 +2856,40 @@ msgstr ""
"Virhe, pkgProblemResolver::Resolve tuotti katkoja, syynä voi olla pysytetyt "
"paketit."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
-
-#: apt-pkg/indexrecords.cc:83
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-
-#: apt-pkg/indexrecords.cc:91
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Huomautus, valitaan %s eikä %s\n"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:152
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Virheellinen rivi korvautustiedostossa: %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)"
-
-#: apt-pkg/sourcelist.cc:170
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-
-#: apt-pkg/sourcelist.cc:173
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-
-#: apt-pkg/sourcelist.cc:190
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-
-#: apt-pkg/sourcelist.cc:193
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
-
-#: apt-pkg/sourcelist.cc:206
-#, 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:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Muodostetaan riippuvuussuhteiden puu"
-#: apt-pkg/sourcelist.cc:211
-#, 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/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Mahdolliset versiot"
-#: apt-pkg/sourcelist.cc:217
-#, 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/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Luodaan riippuvuudet"
-#: apt-pkg/sourcelist.cc:224
-#, 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/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Luetaan tilatiedot"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "Avataan %s"
+msgid "Failed to open StateFile %s"
+msgstr "Tilatiedoston %s avaaminen ei onnistunut"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Tilapäisen tilatiedoston %s kirjoittaminen ei onnistunut"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, 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:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Pakettitiedostoa %s ei voi jäsentää (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2926,208 +2901,101 @@ msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt"
msgid "Version '%s' for '%s' was not found"
msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Tehtävää %s ei löytynyt"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Pakettia %s ei löytynyt"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Pakettia %s ei löytynyt"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Asennetaan %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Tehdään asetukset: %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Poistetaan %s"
+#: apt-pkg/indexrecords.cc:83
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/indexrecords.cc:91
#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "%s poistettiin kokonaan"
+msgid "No sections in Release file %s"
+msgstr "Huomautus, valitaan %s eikä %s\n"
-#: apt-pkg/deb/dpkgpm.cc:111
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Noting disappearance of %s"
+msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Suoritetaan jälkiasennusliipaisin %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Kansio \"%s\" puuttuu."
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/indexrecords.cc:145
#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Tiedostoa %s ei voitu avata"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Valmistellaan %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "Puretaan %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "Valmistaudutaan tekemään asetukset: %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1012
-#, c-format
-msgid "Installed %s"
-msgstr "%s asennettu"
-
-#: apt-pkg/deb/dpkgpm.cc:1017
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Valmistaudutaan poistamaan %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, c-format
-msgid "Removed %s"
-msgstr "%s poistettu"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Valmistaudutaan poistamaan %s kokonaan"
-
-#: apt-pkg/deb/dpkgpm.cc:1025
-#, c-format
-msgid "Completely removed %s"
-msgstr "%s poistettiin kokonaan"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Virheellinen rivi korvautustiedostossa: %s"
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
+#: apt-pkg/indexrecords.cc:164
#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
+#, c-format
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Luettelokansiota ei voitu lukita"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "%lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
+msgstr "Valintaa %s ei löydy"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3262,35 +3130,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Valmis"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Valintaa %s ei löydy"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia"
@@ -3352,107 +3191,263 @@ msgstr "Komento stat ei toiminut liitoskohdalle %s"
msgid "Failed to stat the cdrom"
msgstr "Komento stat ei toiminut rompulle"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Tuntematon tyypin lyhenne: \"%c\""
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Avataan asetustiedosto %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, 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:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaksivirhe %s: %u: väärän muotoinen nimikenttä"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, 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:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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:881
+#: apt-pkg/contrib/configuration.cc:887
#, 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:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaksivirhe %s: %u: Sisällytetty tästä"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, 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:897
+#: apt-pkg/contrib/configuration.cc:903
#, fuzzy, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "Syntaksivirhe %s: %u: Direktiivejä voi olla vain ylimmällä tasolla"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, 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/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Komentorivin valitsin \"%c\" [%s] on tuntematon."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Komentorivin valitsin %s on tuntematon"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Komentorivin valitsin %s ei ole totuusarvoinen"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Valitsin %s tarvitsee parametrin"
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Valitsin %s: Asetusarvon määrityksessä on oltava =<arvo>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "Valitsin %s tarvitsee kokonaislukuparametrin, ei \"%s\""
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Valitsin \"%s\" on liian pitkä"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, 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:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Virheellinen toiminto %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Asennetaan %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Tehdään asetukset: %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Poistetaan %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "%s poistettiin kokonaan"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Suoritetaan jälkiasennusliipaisin %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Kansio \"%s\" puuttuu."
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Tiedostoa %s ei voitu avata"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Valmistellaan %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Puretaan %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Valmistaudutaan tekemään asetukset: %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "%s asennettu"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Valmistaudutaan poistamaan %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "%s poistettu"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Valmistaudutaan poistamaan %s kokonaan"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s poistettiin kokonaan"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Tiedostoon %s kirjoittaminen ei onnistu"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Luettelokansiota ei voitu lukita"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "Kutsuttiin DropNode mutta tiedostoon on vielä linkki"
@@ -3557,7 +3552,7 @@ msgstr "Tämä ei ole kelvollinen DEB-arkisto, puuttuu tiedosto \"%s\""
msgid "Internal error, could not locate member %s"
msgstr "Tapahtui sisäinen virhe, tiedostoa %s ei löydy"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Ohjaustiedosto ei jäsenny"
@@ -3586,23 +3581,23 @@ msgstr "Arkisto on pienempi kuin pitäisi"
msgid "Failed to read the archive headers"
msgstr "Arkiston otsikoiden luku ei onnistunut"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Putkien luonti ei onnistunut"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "exec gzip ei onnistunut"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Arkisto on turmeltunut"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar-ohjelman laskema tarkistussumma ei täsmää, arkisto on turmeltunut"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Tuntematon TAR-otsikon tyyppi %u, tiedosto %s"
diff --git a/po/fr.po b/po/fr.po
index 18eef3268..ecb752f5e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,164 +4,165 @@
#
# Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
+# Julien Patriarca <leatherface@debian.org>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
-"PO-Revision-Date: 2013-08-17 07:57+0200\n"
-"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
+"PO-Revision-Date: 2013-12-15 16:45+0100\n"
+"Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 1.5\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"Plural-Forms: Plural-Forms: nplurals=2; plural=n > 1;\n"
#: cmdline/apt-cache.cc:149
#, 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"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Nombre total de paquets : "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Nombre total de structures de paquets : "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Paquets ordinaires : "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Paquets entièrement virtuels : "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Paquets virtuels simples : "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Paquets virtuels mixtes : "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Manquants : "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Nombre de versions distinctes : "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Nombre de descriptions distinctes : "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Nombre de dépendances : "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Nombre de relations version/fichier : "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Nombre de relations description/fichier : "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Nombre de relations « Provides » : "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Nombre de motifs rationnels : "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Espace disque gaspillé : "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Total de l'espace attribué : "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
-msgstr "Fichier %s désynchronisé."
+msgstr "Fichier du paquet %s désynchronisé."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Aucun paquet n'a été trouvé"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Vous devez fournir au moins un motif de recherche"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Cette commande est obsolète. Veuillez utiliser « apt-mark showauto »."
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Impossible de trouver le paquet %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Fichiers du paquet :"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
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"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Paquets épinglés :"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(non trouvé)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Installé : "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Candidat : "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(aucun)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Épinglage de paquet : "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Table de version :"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pour %s compilé sur %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -201,15 +202,15 @@ msgstr ""
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
"\n"
-"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"
+"apt-cache est un outil de bas niveau pour obtenir des informations\n"
+"des fichiers de cache binaires d'APT.\n"
"\n"
"Commandes :\n"
" gencaches - Construit le cache des sources et celui des binaires\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 une forme succincte\n"
" dumpavail - Affiche une liste de fichiers disponibles sur la sortie "
"standard\n"
" unmet - Affiche les dépendances manquantes\n"
@@ -235,22 +236,22 @@ msgstr ""
"plus\n"
"d'informations.\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
"Veuillez indiquer le nom de ce disque, par exemple « Debian 5.0.3 Disk 1 »"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
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"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Impossible de monter « %s » sur « %s »"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
#, fuzzy
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
@@ -263,7 +264,7 @@ msgstr ""
"CD-ROM. Voir la page de manuel d'apt-cdrom pour plus d'informations sur "
"l'auto-détection des CD et le point de montage."
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
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 "
@@ -301,54 +302,50 @@ msgstr ""
" -c=? Lit ce fichier de configuration\n"
" -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:224
+#, c-format
msgid "Can not find a package for architecture '%s'"
-msgstr ""
-"Impossible de trouver de paquet correspondant à l'expression rationnelle "
-"« %s »"
+msgstr "Impossible de trouver de paquet correspondant à l'architecture « %s »"
-#: cmdline/apt-get.cc:322
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:311
+#, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr ""
-"Impossible de trouver de paquet correspondant à l'expression rationnelle "
-"« %s »"
+"Impossible de trouver de paquet «%s » correspondant à la version « %s »"
-#: cmdline/apt-get.cc:325
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:314
+#, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr ""
-"Impossible de trouver de paquet correspondant à l'expression rationnelle "
-"« %s »"
+"Impossible de trouver de paquet « %s » correspondant à la publication « %s »"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Choix de « %s » comme paquet source à la place de « %s »\n"
-#: cmdline/apt-get.cc:418
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:414
+#, c-format
msgid "Can not find version '%s' of package '%s'"
-msgstr "La version « %s » indisponible du paquet « %s » est ignorée"
+msgstr "Impossible de trouver la version « %s » du paquet « %s »"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossible de trouver le paquet %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s passé en « installé manuellement ».\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s passé en « installé automatiquement ».\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -356,41 +353,36 @@ msgstr ""
"Cette commande est obsolète. Veuillez utiliser « apt-mark auto » et « apt-"
"mark manual »."
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Erreur interne, la tentative de résolution du problème a cassé certaines "
"parties"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Impossible de verrouiller le répertoire %s"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Impossible de verrouiller le répertoire de téléchargement"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "Vous devez spécifier au moins un paquet source"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, 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:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-"Note : la maintenance du paquet de « %s » est réalisée dans le système de "
+"Note : la maintenance du paquet de « %s » est réalisée dans le système de "
"suivi de versions « %s » à l'adresse :\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -402,69 +394,69 @@ msgstr ""
"pour récupérer les dernières mises à jour (éventuellement non encore "
"publiées) du paquet.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Nécessité de prendre %so/%so dans les sources.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Nécessité de prendre %so dans les sources.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Récupération des sources %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Échec lors de la récupération de quelques archives."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Téléchargement achevé et dans le mode téléchargement uniquement"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "La commande de décompactage « %s » a échoué.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "La commande de construction « %s » a échoué.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Échec du processus fils"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Il faut spécifier au moins un paquet pour vérifier les dépendances de "
"construction"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -474,27 +466,27 @@ msgstr ""
"consulter la section à propos de APT::Architectures dans la page de manuel "
"apt.conf(5)."
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Impossible d'activer les dépendances de construction"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossible d'obtenir les dépendances de construction pour %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s n'a pas de dépendance de construction.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -503,7 +495,7 @@ msgstr ""
"La dépendance %s vis-à-vis de %s ne peut être satisfaite car %s n'est pas "
"autorisé avec les paquets « %s »."
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -512,14 +504,14 @@ msgstr ""
"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne "
"peut être trouvé"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s "
"est trop récent"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -528,7 +520,7 @@ msgstr ""
"La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version "
"disponible du paquet %s ne peut satisfaire les prérequis de version."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -537,18 +529,18 @@ msgstr ""
"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s "
"n'a pas de version disponible."
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Impossible de satisfaire les dépendances %s pour %s : %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
"Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Impossible d'activer les dépendances de construction"
@@ -611,7 +603,7 @@ msgstr ""
" 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"
+"télécharger et à installer des paquets. Les commandes les plus\n"
"fréquemment employées sont update et install.\n"
"\n"
"Commandes :\n"
@@ -619,7 +611,7 @@ msgstr ""
" 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"
-" autoremove - Supprime tous les paquets installés automatiquement\n"
+" autoremove - Supprime automatiquement les dépendances inutilisés\n"
" purge - Supprime des paquets et leurs fichiers de configuration\n"
" source - Télécharge les archives de sources\n"
" build-dep - Configure build-dependencies pour les paquets sources\n"
@@ -643,7 +635,7 @@ msgstr ""
" -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"
+" -b Compile le paquet source après l'avoir récupéré\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"
@@ -660,11 +652,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Vous devez spécifier au moins un paquet source"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -678,54 +670,55 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "%s ne peut pas être marqué car il n'est pas installé.\n"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s était déjà marqué comme installé manuellement.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s était déjà marqué comme installé automatiquement.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr "%s était déjà marqué comme figé (« hold »).\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr "%s était déjà marqué comme non figé.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "A attendu %s mais il n'était pas présent"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr "%s passé en figé (« hold »).\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "Annulation de l'état figé pour %s.\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
"Échec de l'exécution de dpkg. Possédez-vous les privilèges du "
"superutilisateur ?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -776,6 +769,7 @@ msgstr ""
"pour plus d'informations."
#: cmdline/apt.cc:47
+#, fuzzy
msgid ""
"Usage: apt [options] command\n"
"\n"
@@ -796,6 +790,19 @@ msgid ""
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
+"Utilisation : apt [options] commande\n"
+"\n"
+"Interface Ligne de Commande (CLI) pour apt.\n"
+"Commandes : \n"
+"list - liste les paquets selon leur nom\n"
+"search - cherche dans les descriptions de paquet\n"
+"show - affiche les détails du paquet\n"
+"\n"
+"update - met à jour la liste des paquets disponibles\n"
+"install - installes les paquets\n"
+"upgrade - met à jour les paquets du système\n"
+"\n"
+"edit-sources - édite le fichier d'information source\n"
#: methods/cdrom.cc:203
#, c-format
@@ -840,7 +847,7 @@ msgstr "Impossible de modifier l'heure "
#: methods/file.cc:48
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 par //"
#. Login must be before getpeername otherwise dante won't work.
#: methods/ftp.cc:178
@@ -858,7 +865,7 @@ msgstr "Impossible de déterminer le nom local"
#: methods/ftp.cc:220 methods/ftp.cc:248
#, 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é la connexion et a répondu : %s"
#: methods/ftp.cc:226
#, c-format
@@ -937,7 +944,7 @@ msgstr "Impossible de se connecter au port en mode passif."
#: methods/ftp.cc:736
msgid "getaddrinfo was unable to get a listening socket"
-msgstr "gettaddrinfo n'a pu obtenir un port d'écoute"
+msgstr "getaddrinfo n'a pu obtenir un port d'écoute"
#: methods/ftp.cc:750
msgid "Could not bind a socket"
@@ -973,7 +980,7 @@ msgstr "Délai de connexion au port de données dépassé"
msgid "Unable to accept connection"
msgstr "Impossible d'accepter une connexion"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Problème de hachage du fichier"
@@ -984,7 +991,7 @@ msgstr "Impossible de récupérer le fichier, le serveur a répondu « %s »"
#: methods/ftp.cc:907 methods/rsh.cc:338
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 de données dans les délais"
#: methods/ftp.cc:944
#, c-format
@@ -1064,25 +1071,25 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr "Impossible de se connecter à %s:%s :"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erreur interne : signature correcte, mais il est impossible de déterminer "
"l'empreinte de la clé."
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Au moins une signature non valable a été rencontrée."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"Impossible d'exécuter « apt-key » pour contrôler la signature (veuillez "
"vérifier si gnupg est installé)."
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1091,15 +1098,15 @@ msgstr ""
"Le fichier signé en clair n'est pas valable, ce qui a été reçu est « %s ». "
"Peut-être le réseau nécessite-t-il une authentification."
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Erreur inconnue à l'exécution de apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Les signatures suivantes ne sont pas valables :\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1111,31 +1118,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr "Les fichiers vides ne peuvent être des archives valables"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Erreur d'écriture sur le fichier"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Erreur de lecture du serveur"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Erreur d'écriture sur un fichier"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Sélection défaillante"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Délai de connexion dépassé"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Erreur d'écriture du fichier de sortie"
@@ -1143,52 +1150,297 @@ msgstr "Erreur d'écriture du fichier de sortie"
msgid "Waiting for headers"
msgstr "Attente des fichiers d'en-tête"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Mauvaise ligne d'en-tête"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "Le serveur http a envoyé une réponse dont l'en-tête est invalide"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Ce serveur http possède un support des limites non-valide"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Format de date inconnu"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Mauvais en-tête de donnée"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Échec de la connexion"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Erreur interne"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "En train de lister"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Correction des dépendances..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " a échoué."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Impossible de corriger les dépendances"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossible de minimiser le nombre des paquets mis à jour"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Fait"
+
+#: apt-private/private-cachefile.cc:110
+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."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "installé, pouvant être mis à jour vers :"
+
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr " [installé, local]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[installé, pouvant être supprimé automatiquement]"
+
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr " [installé, automatique]"
+
+#: apt-private/private-output.cc:274
+msgid "[installed]"
+msgstr " [installé]"
+
+#: apt-private/private-output.cc:277
+#, fuzzy, c-format
+msgid "[upgradable from: %s]"
+msgstr "[pouvant être mis à jour depuis :"
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr "[configuration restante]"
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "mais %s est installé"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mais %s devra être installé"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "mais il n'est pas installable"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "mais c'est un paquet virtuel"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "mais il n'est pas installé"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "mais ne sera pas installé"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " ou"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Les NOUVEAUX paquets suivants seront installés :"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Les paquets suivants seront ENLEVÉS :"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Les paquets suivants ont été conservés :"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Les paquets suivants seront mis à jour :"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Les paquets retenus suivants seront changés :"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (en raison de %s) "
+
+#: apt-private/private-output.cc:696
+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."
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu mis à jour, %lu nouvellement installés, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu réinstallés, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu remis à une version inférieure, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu à enlever et %lu non mis à jour.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu partiellement installés ou enlevés.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[O/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[o/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "O"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Erreur de compilation de l'expression rationnelle - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "La commande de mise à jour ne prend pas de paramètre"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
+msgstr "En train de trier"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "pas un véritable paquet (virtuel)"
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
msgstr ""
+"NOTE: Ceci n'est qu'une simulation !\n"
+" apt-get a besoin des privilèges du superutilisateur\n"
+" pour pouvoir vraiment fonctionner.\n"
+" Veuillez aussi noter que le verrouillage est désactivé,\n"
+" et la situation n'est donc pas forcément représentative\n"
+" de la réalité !"
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
@@ -1204,6 +1456,7 @@ msgid "Internal error, Ordering didn't finish"
msgstr "Erreur interne. Le tri a été interrompu."
#: apt-private/private-install.cc:147
+#, fuzzy
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Étrangement, les tailles ne correspondent pas. Veuillez le signaler par "
@@ -1284,7 +1537,7 @@ 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-"
+"Impossible de récupérer certaines archives, peut-être devrez-vous lancer apt-"
"get update ou essayer avec --fix-missing ?"
#: apt-private/private-install.cc:299
@@ -1294,7 +1547,7 @@ msgstr ""
#: apt-private/private-install.cc:304
msgid "Unable to correct missing packages."
-msgstr "Impossible de corriger le fait que les paquets manquent."
+msgstr "Impossible de corriger le fait que des paquets manquent."
#: apt-private/private-install.cc:305
msgid "Aborting install."
@@ -1317,12 +1570,12 @@ msgstr[1] ""
#: apt-private/private-install.cc:345
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-"Note : cette opération volontaire (effectuée par dpkg) est automatique."
+"Note : cette opération volontaire (effectuée par dpkg) est automatique."
#: apt-private/private-install.cc:366
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-"Aucune suppression n'est censée se produire : impossible de lancer "
+"Aucune suppression n'est censée se produire : impossible de lancer "
"« Autoremover »"
#: apt-private/private-install.cc:474
@@ -1468,254 +1721,6 @@ msgstr ""
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"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Correction des dépendances..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " a échoué."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Impossible de corriger les dépendances"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossible de minimiser le nombre des paquets mis à jour"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Fait"
-
-#: apt-private/private-cachefile.cc:110
-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."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dépendances manquantes. Essayez d'utiliser l'option -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installé]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Installé]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Installé]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Installé]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "mais %s est installé"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mais %s devra être installé"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "mais il n'est pas installable"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "mais c'est un paquet virtuel"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "mais il n'est pas installé"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "mais ne sera pas installé"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " ou"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Les paquets suivants contiennent des dépendances non satisfaites :"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Les NOUVEAUX paquets suivants seront installés :"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Les paquets suivants seront ENLEVÉS :"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Les paquets suivants ont été conservés :"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Les paquets suivants seront mis à jour :"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Les paquets suivants seront mis à une VERSION INFÉRIEURE :"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Les paquets retenus suivants seront changés :"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (en raison de %s) "
-
-#: apt-private/private-output.cc:696
-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."
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu mis à jour, %lu nouvellement installés, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu réinstallés, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu remis à une version inférieure, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu à enlever et %lu non mis à jour.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu partiellement installés ou enlevés.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[O/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[o/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "O"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Erreur de compilation de l'expression rationnelle - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "La commande de mise à jour ne prend pas de paramètre"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"NOTE: Ceci n'est qu'une simulation !\n"
-" apt-get a besoin des privilèges du superutilisateur\n"
-" pour pouvoir vraiment fonctionner.\n"
-" Veuillez aussi noter que le verrouillage est désactivé,\n"
-" et la situation n'est donc pas forcément représentative\n"
-" de la réalité !"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1755,34 +1760,38 @@ msgid "You don't have enough free space in %s."
msgstr "Pas assez d'espace disponible sur %s"
#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
+#, c-format
msgid "Failed to parse %s. Edit again? "
-msgstr "Impossible de changer le nom %s en %s"
+msgstr "Impossible de lire %s. Faut-il l'éditer à nouveau ?"
#: apt-private/private-sources.cc:70
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
+msgstr "Votre fichier « %s » a changé, veuillez lancer « apt-get update »."
#: apt-private/private-search.cc:69
msgid "Full Text Search"
-msgstr ""
+msgstr "Recherche en texte intégral"
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Atteint "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Atteint:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Réception de : "
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Réception de:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ign:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Err:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1808,17 +1817,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Impossible de lire %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1876,7 +1885,7 @@ msgstr "Quelques erreurs sont apparues lors du décompactage. Les paquets qui"
#: dselect/install:103
msgid "will be configured. This may result in duplicate errors"
msgstr ""
-"ont été installés vont être configurés . Il peut en résulter d'autres erreurs"
+"ont été installés vont être configurés. Il peut en résulter d'autres erreurs"
#: dselect/install:104
msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1895,7 +1904,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Fusion des informations disponibles"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1919,47 +1928,47 @@ msgstr ""
" -c=? Lit ce fichier de configuration\n"
" -o=? Spécifie une option de configuration, p. ex. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Impossible de statuer pour %s."
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Impossible d'écrire sur %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "La liste d'extension du paquet est trop longue"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Erreur lors du traitement du répertoire %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "La liste d'extension des sources est trop grande"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Erreur lors de l'écriture de l'en-tête du fichier contenu"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Erreur du traitement du contenu %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -2010,8 +2019,9 @@ msgstr ""
" 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"
-"des remplacements fonctionnels pour dpkg-scanpackages et dpkg-scansources\n"
+"prend en charge 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"
@@ -2026,7 +2036,7 @@ msgstr ""
"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"
+"drapeaux d'annulation. « Pathprefix » est ajouté au champ du nom 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"
@@ -2042,11 +2052,11 @@ msgstr ""
" -c=? Lit ce fichier de configuration\n"
" -o=? Place une option de configuration arbitraire"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Aucune sélection ne correspond"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr ""
@@ -2159,22 +2169,22 @@ msgstr " Seuil de delink de %so atteint.\n"
msgid "Archive had no package field"
msgstr "L'archive ne possède pas de champ de paquet"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr "%s ne possède pas d'entrée « override »\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " le responsable de %s est %s et non %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ne possède pas d'entrée « source override »\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, 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"
@@ -2260,7 +2270,7 @@ msgstr "Problème en déliant %s"
msgid "Failed to rename %s to %s"
msgstr "Impossible de changer le nom %s en %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2277,7 +2287,7 @@ msgstr ""
"\n"
"apt-internal-solver est une interface en ligne de commande\n"
"permettant d'utiliser la résolution interne d'apt de manière externe\n"
-"avec les outils de la famille d'APT à des fins de déboguage ou\n"
+"avec les outils de la famille d'APT à des fins de déboguage ou\n"
"équivalent.\n"
"\n"
"Options:\n"
@@ -2287,11 +2297,11 @@ msgstr ""
" -o=? utilisation d'une option de configuration,\n"
" p. ex. -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Enregistrement de paquet inconnu !"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2319,7 +2329,7 @@ msgstr ""
#: apt-pkg/install-progress.cc:59
#, c-format
msgid "Progress: [%3i%%]"
-msgstr ""
+msgstr "Progression : [%3i%%]"
#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
msgid "Running dpkg"
@@ -2366,6 +2376,28 @@ msgstr "Impossible de trouver l'enregistrement d'authentification pour %s"
msgid "Hash mismatch for: %s"
msgstr "Somme de contrôle de hachage incohérente pour %s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Le pilote pour la méthode %s n'a pu être trouvé."
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "La méthode %s n'a pas démarré correctement"
+
+#: apt-pkg/acquire-worker.cc:485
+#, 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."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2380,178 +2412,319 @@ msgstr "Vous pouvez lancer « apt-get update » pour corriger ces problèmes."
msgid "The list of sources could not be read."
msgstr "La liste des sources ne peut être lue."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Cache des paquets vide"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Le fichier de cache des paquets est corrompu"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Le fichier de cache des paquets a une version incompatible"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr "Le fichier de cache des paquets est corrompu, il est trop petit."
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Cet APT ne supporte pas le système de version « %s »"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Le cache des paquets a été construit pour une architecture différente"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Dépend"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Pré-Dépend"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Suggère"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Recommande"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Est en conflit avec"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Remplace"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Rend obsolète"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Casse"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Améliore"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "important"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "nécessaire"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "optionnel"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "supplémentaire"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Calcul de la mise à jour"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Le pilote pour la méthode %s n'a pu être trouvé."
+msgid "Index file type '%s' is not supported"
+msgstr "Le type de fichier d'index « %s » n'est pas accepté"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "La méthode %s n'a pas démarré correctement"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s (impossible d'analyser "
+"[option])"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-"Veuillez insérer le disque « %s » dans le lecteur « %s » et appuyez sur la "
-"touche Entrée."
+"Ligne %lu mal formée dans la liste de sources %s ([option] trop courte)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s ([%s] n'est pas une "
+"affectation)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s ([%s] n'a pas de clé)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Ligne %lu mal formée dans la liste des sources %s ([%s] la clé %s n'a pas de "
+"valeur)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)"
+
+#: apt-pkg/sourcelist.cc:211
+#, 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)"
+
+#: apt-pkg/sourcelist.cc:217
+#, 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)"
+
+#: apt-pkg/sourcelist.cc:224
+#, 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)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Ouverture de %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, 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:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Ligne %u mal formée dans la liste des sources %s (type)"
+
+#: apt-pkg/sourcelist.cc:375
+#, 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"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "Le type de fichier d'index « %s » n'est pas accepté"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Construction de l'arbre des dépendances"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Impossible de localiser %s."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versions possibles"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Le cache possède un système de version incompatible"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Génération des dépendances"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Erreur apparue lors du traitement de %s (%s%d)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Lecture des informations d'état"
+#: apt-pkg/pkgcachegen.cc:273
+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 cette version d'APT est "
+"capable de traiter."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"Vous avez dépassé le nombre de versions que cette version d'APT est capable "
+"de traiter."
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:279
+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:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Vous avez dépassé le nombre de dépendances que cette version d'APT est "
+"capable de traiter."
+
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Impossible d'ouvrir le fichier d'état %s"
+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 "
+"fichiers"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Erreur d'écriture du fichier d'état temporaire %s"
+msgid "Couldn't stat source package list %s"
+msgstr "Impossible de localiser la liste des paquets sources %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Lecture des listes de paquets"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Assemblage des fichiers listés dans les champs Provides"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr ""
+"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Envoi du scénario au solveur"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Envoi d'une requête au solveur"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Préparation à la réception de la solution"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "Échec du solveur externe sans message d'erreur adapté"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "Exécution du solveur externe"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "impossible de changer le nom, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Somme de contrôle de hachage incohérente"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Taille incohérente"
-#: apt-pkg/acquire-item.cc:255
-#, fuzzy
+#: apt-pkg/acquire-item.cc:250
msgid "Invalid file format"
-msgstr "L'opération %s n'est pas valable"
+msgstr "Format de fichier invalide"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Erreur d'écriture"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
#, fuzzy
msgid "Does not start with a cleartext signature"
msgstr "Le fichier %s ne commence pas par un message signé en clair."
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2562,7 +2735,7 @@ msgstr ""
"GPG : %s : %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "Erreur de GPG : %s : %s"
@@ -2578,55 +2751,55 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
"Impossible de trouver l'entrée « %s » attendue dans le fichier « Release » : "
-" ligne non valable dans sources.list ou fichier corrompu"
+"ligne non valable dans sources.list ou fichier corrompu"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr ""
-"Impossible de trouver la comme de contrôle de « %s » dans le fichier Release"
+"Impossible de trouver la somme de contrôle de « %s » dans le fichier Release"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
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"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
"Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises "
-"à jour depuis ce dépôt ne s'effectueront pas."
+"à jour depuis ce dépôt ne s'effectueront pas."
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)"
+msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2635,14 +2808,14 @@ msgstr ""
"Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
"devrez corriger ce paquet vous-même (absence d'architecture)."
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
"Impossible de trouver une source de téléchargement de la version « %s » de "
"« %s »"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2650,124 +2823,43 @@ msgstr ""
"Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
"pour le paquet %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Le cache possède un système de version incompatible"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Erreur apparue lors du traitement de %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:273
-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 cette version d'APT est "
-"capable de traiter."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Vous avez dépassé le nombre de versions que cette version d'APT est capable "
-"de traiter."
-
-#: apt-pkg/pkgcachegen.cc:279
-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:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Vous avez dépassé le nombre de dépendances que cette version d'APT est "
-"capable de traiter."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, 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 "
-"fichiers"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Impossible de localiser la liste des paquets sources %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Lecture des listes de paquets"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Assemblage des fichiers listés dans les champs Provides"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr ""
-"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Le bloc de fournisseur %s ne comporte pas d'empreinte"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Le répertoire %spartial pour les listes n'existe pas."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Le répertoire d'archive %spartial n'existe pas."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Le type de fichier d'index « %s » n'est pas accepté"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "Impossible de verrouiller le répertoire %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Téléchargement du fichier %li sur %li (%s restant)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Téléchargement du fichier %li sur %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-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/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
"Vous devez insérer quelques adresses « sources » dans votre sources.list"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Impossible de localiser %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2793,7 +2885,7 @@ msgstr "Type d'épinglage %s inconnu"
msgid "No priority (or zero) specified for pin"
msgstr "Aucune priorité (ou zéro) n'a été spécifiée pour l'épinglage"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2803,12 +2895,12 @@ msgstr ""
"consulter la page de manuel apt.conf(5) et notamment la section à propos de "
"APT::Immediate-Configure, pour plus d'informations. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr "Impossible de configurer « %s »."
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2820,10 +2912,13 @@ msgstr ""
"Depends. C'est souvent une mauvaise chose, mais si vous souhaitez réellement "
"le faire, activez l'option APT::Force-LoopBreak."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, 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/update.cc:103 apt-pkg/update.cc:105
+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/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2843,6 +2938,7 @@ msgid "Mounting CD-ROM...\n"
msgstr "Montage du cédérom...\n"
#: apt-pkg/cdrom.cc:620
+#, fuzzy
msgid "Identifying... "
msgstr "Identification..."
@@ -2852,6 +2948,7 @@ msgid "Stored label: %s\n"
msgstr "Étiquette stockée : %s\n"
#: apt-pkg/cdrom.cc:680
+#, fuzzy
msgid "Scanning disc for index files...\n"
msgstr "Examen du disque à la recherche de fichiers d'index...\n"
@@ -2894,11 +2991,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Copie des listes de paquets..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Écriture de la nouvelle liste de sources\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Les entrées de listes de sources pour ce disque sont :\n"
@@ -2910,7 +3007,7 @@ msgstr ""
"Le paquet %s doit être réinstallé, mais il est impossible de trouver son "
"archive."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2918,211 +3015,100 @@ msgstr ""
"Erreur, pkgProblem::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:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Impossible de corriger les problèmes, des paquets défectueux sont en mode "
"« garder en l'état »."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "Envoi du scénario au solveur"
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr "Envoi d'une requête au solveur"
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr "Préparation à la réception de la solution"
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr "Échec du solveur externe sans message d'erreur adapté"
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr "Exécu tion du solveur externe"
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Impossible de traiter le fichier %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Impossible de traiter le fichier %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Impossible d'analyser le fichier Release %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Pas de sections dans le fichier Release %s"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Pas d'entrée de hachage dans le fichier Release %s"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Entrée « Valid-Until » non valable dans le fichier Release %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Entrée « Date » non valable dans le fichier Release %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s (impossible d'analyser "
-"[option])"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Ligne %lu mal formée dans la liste de sources %s ([option] trop courte)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s ([%s] n'est pas une "
-"affectation)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s ([%s] n'a pas de clé)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s ([%s] la clé %s n'a pas de "
-"valeur)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Ligne %lu mal formée dans le fichier de source %s (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Ligne %lu mal formée dans la liste de sources %s (distribution)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construction de l'arbre des dépendances"
-#: apt-pkg/sourcelist.cc:211
-#, 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)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versions possibles"
-#: apt-pkg/sourcelist.cc:217
-#, 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)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Génération des dépendances"
-#: apt-pkg/sourcelist.cc:224
-#, 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)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lecture des informations d'état"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "Ouverture de %s"
+msgid "Failed to open StateFile %s"
+msgstr "Impossible d'ouvrir le fichier d'état %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Ligne %u mal formée dans la liste des sources %s (type)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Erreur d'écriture du fichier d'état temporaire %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, 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"
-
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr ""
-"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Impossible de traiter le fichier %s (%d)"
#: apt-pkg/cacheset.cc:501
#, 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"
#: apt-pkg/cacheset.cc:504
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "La version « %s » de « %s » n'a pu être trouvée"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Impossible de trouver la tâche « %s »"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr ""
"Impossible de trouver de paquet correspondant à l'expression rationnelle "
"« %s »"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr ""
"Impossible de trouver de paquet correspondant à l'expression rationnelle "
"« %s »"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Impossible de choisir les versions du paquet « %s » qui n'est qu'un paquet "
"virtuel"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Impossible de choisir une nouvelle version du paquet « %s » qui n'est qu'un "
"paquet virtuel"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Impossible de choisir une version candidate du paquet « %s » qui n'en n'a pas"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Impossible de choisir la version installée du paquet « %s » qui n'est pas "
"installé"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3131,181 +3117,59 @@ msgstr ""
"Impossible de choisir une version installée ou candidate du paquet « %s » "
"qui n'en n'a aucune"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Installation de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Configuration de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Suppression de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "Suppression complète de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Disparition de %s constatée"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Exécution des actions différées (« trigger ») de %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Répertoire %s inexistant"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Impossible d'ouvrir le fichier « %s »"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Préparation de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Unpacking %s"
-msgstr "Décompression de %s"
+msgid "Unable to parse Release file %s"
+msgstr "Impossible d'analyser le fichier Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Preparing to configure %s"
-msgstr "Préparation de la configuration de %s"
+msgid "No sections in Release file %s"
+msgstr "Pas de sections dans le fichier Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Installed %s"
-msgstr "%s installé"
+msgid "No Hash entry in Release file %s"
+msgstr "Pas d'entrée de hachage dans le fichier Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Préparation de la suppression de %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Entrée « Valid-Until » non valable dans le fichier Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Removed %s"
-msgstr "%s supprimé"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Entrée « Date » non valable dans le fichier Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Préparation de la suppression complète de %s"
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Completely removed %s"
-msgstr "%s complètement supprimé"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Impossible d'écrire sur %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr "L'opération a été interrompue avant de se terminer"
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "problème de dépendances : laissé non configuré"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Aucun rapport « apport » n'a été créé car le message d'erreur indique une "
-"erreur consécutive à un échec précédent."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Aucun rapport « apport » n'a été créé car un disque plein a été signalé"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Aucun « apport » n'a été créé car une erreur de dépassement de capacité "
-"mémoire a été signalée"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Aucun rapport « apport » n'a été créé car un disque plein a été signalé"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Aucun « apport » n'a été créé car une erreur d'entrée/sortie de dpkg a été "
-"signalée"
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Impossible de verrouiller le répertoire d'administration (%s). Il est "
-"possible qu'un autre processus l'utilise."
+msgid "%limin %lis"
+msgstr "%limin %lis"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Impossible de verrouiller le répertoire d'administration (%s). Avez-vous les "
-"privilèges du superutilisateur ?"
+msgid "%lis"
+msgstr "%lis"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"dpkg a été interrompu. Il est nécessaire d'utiliser « %s » pour corriger le "
-"problème."
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Non verrouillé"
+msgid "Selection %s not found"
+msgstr "La sélection %s n'a pu être trouvée"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3448,35 +3312,6 @@ msgstr "…"
msgid "%c%s... %u%%"
msgstr "%c%s… %u%%"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "La sélection %s n'a pu être trouvée"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Impossible de mapper un fichier vide en mémoire"
@@ -3543,111 +3378,282 @@ msgstr "Impossible de localiser le point de montage %s"
msgid "Failed to stat the cdrom"
msgstr "Impossible d'accéder au cédérom."
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Type d'abréviation non reconnue : « %c »"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Ouverture du fichier de configuration %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Erreur syntaxique %s:%u : le bloc commence sans aucun nom."
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Erreur syntaxique %s:%u : balise mal formée"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Erreur syntaxique %s:%u : valeur suivie de choses illicites"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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 "
"niveau le plus haut"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Erreur syntaxique %s:%u: trop de niveaux d'imbrication d'includes"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Erreur syntaxique %s:%u : inclus à partir d'ici"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Erreur syntaxique %s:%u : directive « %s » non tolérée"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Erreur de syntaxe %s:%u : la directive « clear » a besoin d'un arbre "
"d'options comme paramètre"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Erreur syntaxique %s:%u : valeur aberrante à la fin du fichier"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, 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."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, 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:171
+#: apt-pkg/contrib/cmndline.cc:174
#, 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"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "L'option %s nécessite un paramètre."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Option %s : l'item configuration doit être spécifiée avec un =<val>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "L'option %s prend un nombre entier en paramètre, et non « %s »"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "L'option « %s » est trop longue"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, 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:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "L'opération %s n'est pas valable"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Installation de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Configuration de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Suppression de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "Suppression complète de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Disparition de %s constatée"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Exécution des actions différées (« trigger ») de %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Répertoire %s inexistant"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Impossible d'ouvrir le fichier « %s »"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Préparation de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Décompression de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Préparation de la configuration de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "%s installé"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Préparation de la suppression de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "%s supprimé"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Préparation de la suppression complète de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s complètement supprimé"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, c-format
+msgid "Can not write log (%s)"
+msgstr "Impossible d'écrire le journal (%s)"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr "Est-ce que /dev/pts est monté ?"
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "L'opération a été interrompue avant de se terminer"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr "Aucun rapport « apport » écrit car MaxReports a déjà été atteint"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "problème de dépendances : laissé non configuré"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Aucun rapport « apport » n'a été créé car le message d'erreur indique une "
+"erreur consécutive à un échec précédent."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Aucun rapport « apport » n'a été créé car un disque plein a été signalé"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Aucun rapport « apport » n'a été créé car une erreur de dépassement de "
+"capacité mémoire a été signalée"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Aucun rapport « apport » n'a été créé car le message d'erreur rapporte un "
+"problème sur le système local"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Aucun rapport « apport » n'a été créé car une erreur d'entrée/sortie de dpkg "
+"a été signalée"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Impossible de verrouiller le répertoire d'administration (%s). Il est "
+"possible qu'un autre processus l'utilise."
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+"Impossible de verrouiller le répertoire d'administration (%s). Avez-vous les "
+"privilèges du superutilisateur ?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"dpkg a été interrompu. Il est nécessaire d'utiliser « %s » pour corriger le "
+"problème."
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Non verrouillé"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "DropNode appelé sur un nœud toujours lié"
@@ -3745,14 +3751,14 @@ msgstr "Échec de clôture du fichier %s"
#: apt-inst/deb/debfile.cc:63
#, 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:132
#, c-format
msgid "Internal error, could not locate member %s"
msgstr "Erreur interne, ne peut localiser la partie %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Fichier de contrôle non traitable"
@@ -3781,23 +3787,23 @@ msgstr "L'archive est trop petite"
msgid "Failed to read the archive headers"
msgstr "Échec de la lecture des en-têtes d'archive"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Échec de création de tubes"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Impossible d'exécuter gzip "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Archive corrompue"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Échec dans la somme de contrôle de tar, l'archive est corrompue"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Type d'en-tête %u inconnu pour TAR, partie %s"
@@ -3814,34 +3820,39 @@ msgstr "Type d'en-tête %u inconnu pour TAR, partie %s"
#~ msgid "No keyring installed in %s."
#~ msgstr "Pas de porte-clés installé dans %s."
-#, fuzzy
#~ msgid "Internal error, Upgrade broke stuff"
-#~ msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
-
-#~ msgid "%s not a valid DEB package."
-#~ msgstr "%s n'est pas un paquet Debian valide."
-
-#~ 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"
+#~ msgstr "Erreur interne, Upgrade a cassé le boulot !"
#~ msgid ""
#~ "Could not patch %s with mmap and with file operation usage - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
#~ "Impossible de modifier %s avec mmap et l'utilisation des opérations de "
-#~ "fichiers : le correctif semble être corrompu."
+#~ "fichiers : le correctif semble être corrompu."
#~ msgid ""
#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
#~ "seems to be corrupt."
#~ msgstr ""
-#~ "Impossible de modifier %s avec mmap (sans échec particulier de mmap) : le "
+#~ "Impossible de modifier %s avec mmap (sans échec particulier de mmap) : le "
#~ "correctif semble être corrompu."
+#~ msgid "%s not a valid DEB package."
+#~ msgstr "%s n'est pas un paquet Debian valide."
+
+#~ 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"
+
+#~ msgid "Unmounting CD-ROM\n"
+#~ msgstr "Démontage du cédérom\n"
+
+#~ msgid "Is stdout a terminal?"
+#~ msgstr "Est-ce que stdout est un terminal ?"
+
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Note : sélection de %s pour la tâche « %s »\n"
diff --git a/po/gl.po b/po/gl.po
index 83cd3075d..2adaa302a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_gl\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2011-05-12 15:28+0100\n"
"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
"Language-Team: galician <proxecto@trasno.net>\n"
@@ -27,146 +27,146 @@ msgstr ""
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:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Número total de nomes de paquetes : "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Estruturas de paquetes totais: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Paquetes normais: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Paquetes virtuais puros: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Paquetes virtuais simples: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Paquetes virtuais mixtos: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Non atopados: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Número total de versións distintas: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Número total de descricións distintas: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Número total de dependencias: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Número total de relacións versión/ficheiro: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Número total de relacións descrición/ficheiro: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Número total de asignacións provistas: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Número total de cadeas: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Espazo de reserva total: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Espazo total contabilizado: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "O ficheiro de paquete %s está sen sincronizar."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Non se atopou ningún paquete"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Debe fornecer cando menos un patrón de busca"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Non foi posíbel atopar o paquete %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Ficheiros de paquetes:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
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"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Paquetes inmobilizados:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(non se atopou)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Instalado: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Candidato: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(ningún)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Inmobilizado: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Táboa de versións:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s compilado en %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -240,20 +240,20 @@ msgstr ""
"Vexa a páxina de manual apt-cache(8) e apt.conf(5) para obter mais "
"información.\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Forneza un nome para este disco, como «Debian 5.0.3 Disco 1»"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Insira un disco na unidade e prema Intro"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Produciuse un fallo ao montar «%s» en «%s»"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -261,7 +261,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Repita este proceso para o resto de CD do seu conxunto."
@@ -298,76 +298,71 @@ msgstr ""
" -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Tome «%s» como paquete fonte no canto de «%s»\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Ignorar a versión non dispoñíbel «%s» do paquete «%s»"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Non foi posíbel atopar o paquete %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s cambiado a instalado manualmente.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s está estabelecido para a súa instalación automática.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Produciuse un erro interno, o solucionador interno estragou cousas"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Non é posíbel bloquear o directorio %s"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Non é posíbel bloquear o directorio de descargas"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "Ten que especificar polo menos un paquete para obter o código fonte"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Non sé posíbel atopar un paquete fonte para %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -376,7 +371,7 @@ msgstr ""
"AVISO: o paquete «%s» mantense no sistema de control de versións «%s» en:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -388,96 +383,96 @@ msgstr ""
"para obter as últimas actualizacións (posibelmente non publicadas) do "
"paquete.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Omítese o ficheiro xa descargado «%s»\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Ten que recibir %sB/%sB de arquivos de fonte.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Ten que recibir %sB de arquivos de fonte.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Non se puideron obter algúns arquivos."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Completouse a descarga no modo de só descargas"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omítese o desempaquetado do código fonte xa desempaquetado en %s\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Fallou a orde de desempaquetado «%s».\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, 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:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Fallou a orde de construción de «%s».\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "O proceso fillo fallou"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Ten que especificar polo menos un paquete para comprobarlle as dependencias "
"de compilación"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Non se puideron procesar as dependencias de construción"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Non é posíbel obter a información de dependencias de compilación de %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ten dependencias de compilación.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -486,7 +481,7 @@ msgstr ""
"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
"paquete %s"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -495,14 +490,14 @@ msgstr ""
"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
"paquete %s"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Non foi posíbel satisfacer a dependencia «%s» de %s: O paquete instalado %s "
"é novo de máis"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -511,7 +506,7 @@ msgstr ""
"A dependencia «%s» de %s non se pode satisfacer porque ningunha versión "
"dispoñíbel do paquete %s satisfai os requirimentos de versión"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -520,17 +515,17 @@ msgstr ""
"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
"paquete %s"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Non foi posíbel satisfacer a dependencia «%s» de %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Non se puideron satisfacer as dependencias de construción de %s."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Non se puideron procesar as dependencias de construción"
@@ -645,11 +640,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Ten que especificar polo menos un paquete para obter o código fonte"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -663,52 +658,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "mais non está instalado"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s cambiado a instalado manualmente.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s está estabelecido para a súa instalación automática.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s xa é a versión máis recente.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s xa é a versión máis recente.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Agardouse por %s pero non estaba alí"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "%s cambiado a instalado manualmente.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "Non foi posíbel abrir %s"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -930,7 +926,7 @@ msgstr "A conexión do socket de datos esgotou o tempo"
msgid "Unable to accept connection"
msgstr "Non é posíbel aceptar a conexión"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Xurdiu un problema ao calcular o hash do ficheiro"
@@ -1019,40 +1015,40 @@ msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Non é posíbel conectar %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erro interno: Sinatura correcta, pero non foi posíbel determinar a pegada "
"dixital da chave"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Atopouse polo menos unha sinatura incorrecta."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"Non é posíbel executar «apt-key» para verificar a sinatura (Está instalado "
"gnupg?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Produciuse un erro descoñecido ao executar apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "As seguintes sinaturas non eran correctas:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1064,32 +1060,32 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr "Os ficheiros baleiros non poden ser arquivadores válidos"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Produciuse un erro ao escribir no ficheiro"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Produciuse un erro ao ler do servidor. O extremo remoto pechou a conexión"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Produciuse un erro ao ler do servidor"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Produciuse un erro ao escribir nun ficheiro"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Fallou a chamada a select"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "A conexión esgotou o tempo"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Produciuse un erro ao escribir no ficheiro de saída"
@@ -1097,54 +1093,300 @@ msgstr "Produciuse un erro ao escribir no ficheiro de saída"
msgid "Waiting for headers"
msgstr "Agardando polas cabeceiras"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Liña de cabeceira incorrecta"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor HTTP enviou unha cabeceira de resposta incorrecta"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
"O servidor HTTP enviou unha cabeceira cunha lonxitude de contido incorrecta"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor HTTP enviou unha cabeceira cun rango de contido incorrecto"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Este servidor HTTP ten a compatibilidade de rangos estragada"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Formato de datos descoñecido"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Datos da cabeceira incorrectos"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Produciuse un fallo na conexión"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Produciuse un erro interno"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Corrixindo as dependencias..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " fallou."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Non foi posíbel corrixir as dependencias."
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Non foi posíbel minimizar o conxunto de anovacións"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Feito"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Pode querer executar «apt-get -f install» para corrixilos."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependencias incumpridas. Probe a empregar -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "mais %s está instalado"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mais vaise instalar %s"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "mais non é instalábel"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "mais é un paquete virtual"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "mais non está instalado"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "mais non se vai a instalar"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " ou"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Os seguintes paquetes NOVOS hanse instalar:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Vanse RETIRAR os paquetes seguintes:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Consérvanse os seguintes paquetes:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Vanse anovar os paquetes seguintes:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Vanse REVERTER os seguintes paquetes :"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Vanse modificar os paquetes retidos seguintes:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (por mor de %s) "
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"AVISO: Retiraranse os seguintes paquetes esenciais.\n"
+"Isto NON se debe facer a menos que saiba exactamente o que está a facer!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu anovados, %lu instalados, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalados, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu revertidos, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu non instalados ou retirados de todo.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Produciuse un erro na compilación da expresión regular - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "A orde «update» non toma argumentos"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"NOTA: Isto é só unha simulación!\n"
+" apt-get precisa de privilexios de administrador para executarse "
+"realmente.\n"
+" Lembre tamén que o bloqueo está desactivado,\n"
+" polo que non debe depender da relevancia da situación actual real."
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1411,252 +1653,6 @@ msgstr "O paquete %s non está instalado, así que non foi retirado\n"
msgid "Package '%s' is not installed, so not removed\n"
msgstr "O paquete %s non está instalado, así que non foi retirado\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Corrixindo as dependencias..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " fallou."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Non foi posíbel corrixir as dependencias."
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Non foi posíbel minimizar o conxunto de anovacións"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Feito"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Pode querer executar «apt-get -f install» para corrixilos."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependencias incumpridas. Probe a empregar -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "mais %s está instalado"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mais vaise instalar %s"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "mais non é instalábel"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "mais é un paquete virtual"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "mais non está instalado"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "mais non se vai a instalar"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " ou"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Os seguintes paquetes NOVOS hanse instalar:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Vanse RETIRAR os paquetes seguintes:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Consérvanse os seguintes paquetes:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Vanse anovar os paquetes seguintes:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Vanse REVERTER os seguintes paquetes :"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Vanse modificar os paquetes retidos seguintes:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (por mor de %s) "
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"AVISO: Retiraranse os seguintes paquetes esenciais.\n"
-"Isto NON se debe facer a menos que saiba exactamente o que está a facer!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu anovados, %lu instalados, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalados, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu revertidos, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu non instalados ou retirados de todo.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Produciuse un erro na compilación da expresión regular - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "A orde «update» non toma argumentos"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"NOTA: Isto é só unha simulación!\n"
-" apt-get precisa de privilexios de administrador para executarse "
-"realmente.\n"
-" Lembre tamén que o bloqueo está desactivado,\n"
-" polo que non debe depender da relevancia da situación actual real."
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1710,20 +1706,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Teño "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Teño:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Rcb:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Rcb:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1749,17 +1749,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Non é posíbel ler %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1834,7 +1834,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Mesturando a información sobre paquetes dispoñíbeis"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1859,46 +1859,46 @@ msgstr ""
" -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Non é posíbel determinar o estado %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Non é posíbel escribir en %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Non é posíbel obter a versión de debconf. Debconf está instalado?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "A lista de extensións de paquetes é longa de máis"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Produciuse un erro ao procesar o directorio %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "A lista de extensións de fontes é longa de máis"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Produciuse un erro ao gravar a cabeceira no ficheiro de contido"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Produciuse un erro ao procesar o contido %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1981,11 +1981,11 @@ msgstr ""
" -c=? Le este ficheiro de configuración\n"
" -o=? Estabelece unha opción de configuración"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Non coincide ningunha selección"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Faltan ficheiros no grupo de ficheiros de paquetes «%s»"
@@ -2097,22 +2097,22 @@ msgstr " Acadouse o límite de desligado de %sB.\n"
msgid "Archive had no package field"
msgstr "O arquivo non tiña un campo Package"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s non ten unha entrada de «override»\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " O mantedor de %s é %s, non %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, 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:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s tampouco ten unha entrada de «override» de binarios\n"
@@ -2198,7 +2198,7 @@ msgstr "Xurdiu un problema ao desligar %s"
msgid "Failed to rename %s to %s"
msgstr "Non foi posíbel cambiar o nome de %s a %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2224,11 +2224,11 @@ msgstr ""
" -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Rexistro de paquete descoñecido!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2303,6 +2303,26 @@ msgstr "Non é posíbel atopar un rexistro de autenticación para: %s"
msgid "Hash mismatch for: %s"
msgstr "Valor de hash non coincidente para: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Non foi posíbel atopar o controlador de métodos %s."
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "O método %s non se iniciou correctamente"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Insira o disco etiquetado: «%s» na unidade «%s» e prema Intro."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2317,176 +2337,304 @@ msgstr "Pode querer executar «apt-get update» para corrixir estes problemas"
msgid "The list of sources could not be read."
msgstr "Non foi posíbel ler a lista de orixes."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Caché de paquetes baleira"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "O ficheiro de caché de paquetes está danado"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "O ficheiro de caché de paquetes é unha versión incompatíbel"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "O ficheiro de caché de paquetes está danado"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Este APT non admite o sistema de versionado «%s»"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "A caché de paquetes construíuse para unha arquitectura diferente"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Depende"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "PreDepende"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Suxire"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Recomenda"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Conflitos"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Substitúe a"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Fai obsoleto a"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Estraga"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Mellora"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "importante"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "requirido"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "estándar"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "opcional"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "extra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Calculando a anovación"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Non foi posíbel atopar o controlador de métodos %s."
+msgid "Index file type '%s' is not supported"
+msgstr "O tipo de ficheiros de índices «%s» non está admitido"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "O método %s non se iniciou correctamente"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Liña %lu mal construída na lista de fontes %s ([opción] non analizábel)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Insira o disco etiquetado: «%s» na unidade «%s» e prema Intro."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+"Liña %lu mal construída na lista de fontes %s ([opción] demasiado curta)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+"Liña %lu mal construída na lista de fontes %s ([%s] non é unha asignación)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Liña %lu mal construída na lista de fontes %s ([%s] non ten chave)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Liña %lu mal construída na lista de fontes %s ([%s] a chave %s non ten valor)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Liña %lu mal construída na lista de orixes %s (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Liña %lu mal construída na lista de orixes %s (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Liña %lu mal construída na lista de orixes %s (dist absoluta)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Liña %lu mal construída na lista de orixes %s (análise de dist)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Abrindo %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Liña %u longa de máis na lista de orixes %s."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Liña %u mal construída na lista de orixes %s (tipo)"
+
+#: apt-pkg/sourcelist.cc:375
+#, 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 orixes %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "O tipo de ficheiros de índices «%s» non está admitido"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Construindo a árbore de dependencias"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Non é posíbel analizar %s."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versións candidatas"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "A caché ten un sistema de versionado incompatíbel"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Xeración de dependencias"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Produciuse un erro ao procesar %s (FindPkg)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Lendo a información do estado"
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Vaites!, superou o número de nomes de paquetes que este APT pode manexar."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Vaites!, superou o número de versións que este APT pode manexar."
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Vaites!, superou o número de descricións que este APT pode manexar."
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Vaites!, superou o número de dependencias que este APT pode manexar."
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Non foi posíbel abrir o ficheiro de estado %s"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+"Non foi posíbel atopar o paquete %s %s ao procesar as dependencias de "
+"ficheiros"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s"
+msgid "Couldn't stat source package list %s"
+msgstr "Non foi posíbel atopar a lista de paquetes fonte %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Lendo as listas de paquetes"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Recollendo as provisións de ficheiros"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Produciuse un erro de E/S ao gravar a caché de fontes"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "non foi posíbel cambiar o nome, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "A sumas «hash» non coinciden"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Os tamaños non coinciden"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Operación incorrecta: %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Produciuse un erro de escritura"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2497,7 +2645,7 @@ msgstr ""
"%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "Produciuse un erro de GPG: %s %s"
@@ -2513,14 +2661,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2529,36 +2677,36 @@ msgstr ""
"Non é posíbel atopar a entrada agardada «%s» no ficheiro de publicación "
"(entrada sources.list incorrecta ou ficheiro con formato incorrecto)"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr ""
"Non é posíbel ler a suma de comprobación para «%s» no ficheiro de publicación"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "Non hai unha chave pública dispoñíbel para os seguintes ID de chave:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2567,12 +2715,12 @@ msgstr ""
"Non é posíbel atopar un ficheiro para o paquete %s. Isto pode significar que "
"ten que arranxar este paquete a man. (Falta a arquitectura)"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2580,116 +2728,42 @@ msgstr ""
"Os ficheiros de índices de paquetes están danados. Non hai un campo "
"Filename: para o paquete %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "A caché ten un sistema de versionado incompatíbel"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Produciuse un erro ao procesar %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Vaites!, superou o número de nomes de paquetes que este APT pode manexar."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Vaites!, superou o número de versións que este APT pode manexar."
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Vaites!, superou o número de descricións que este APT pode manexar."
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Vaites!, superou o número de dependencias que este APT pode manexar."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-"Non foi posíbel atopar o paquete %s %s ao procesar as dependencias de "
-"ficheiros"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Non foi posíbel atopar a lista de paquetes fonte %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Lendo as listas de paquetes"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Recollendo as provisións de ficheiros"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Produciuse un erro de E/S ao gravar a caché de fontes"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "O bloque de provedor %s non contén unha pegada dixital"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Non se atopa a lista de directorios %sparcial."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Non se atopa a lista de arquivos %sparcial."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "O tipo de ficheiros de índices «%s» non está admitido"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "Non é posíbel bloquear o directorio %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Obtendo o ficheiro %li de %li (restan %s)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Obtendo o ficheiro %li de %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Algúns ficheiros de índice fallaron durante a descarga. Ignoráronse, ou "
-"foron utilizados algúns antigos no seu lugar"
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Debe introducir algúns URI «orixe» no seu ficheiro sources.list"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Non é posíbel analizar %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2713,7 +2787,7 @@ msgid "No priority (or zero) specified for pin"
msgstr ""
"Non se indicou unha prioridade (ou indicouse cero) para a inmobilización"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2722,12 +2796,12 @@ msgstr ""
"Non foi posíbel facer a configuración inmediata en «%s». Vexa man 5 apt.conf "
"baixo APT::Immediate-Configure para obter máis detalles. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "Non foi posíbel abrir o ficheiro «%s»"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2738,10 +2812,14 @@ msgstr ""
"por mor dun bucle de Conflitos e Pre-dependencias. Isto adoita ser malo, "
"pero se o quere facer, active a opción APT::Force-LoopBreak."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Liña %u longa de máis na lista de orixes %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Algúns ficheiros de índice fallaron durante a descarga. Ignoráronse, ou "
+"foron utilizados algúns antigos no seu lugar"
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2812,11 +2890,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Copiando as listas de paquetes..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Escribindo a nova lista de orixes\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "As entradas da lista de orixes deste disco son:\n"
@@ -2828,7 +2906,7 @@ msgstr ""
"O paquete %s ten que ser reinstalado, mais non é posíbel atopar o seu "
"arquivo."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2836,143 +2914,40 @@ msgstr ""
"Erro, pkgProblemResolver::Resolve xerou interrupcións, isto pode estar "
"causado por paquetes retidos."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Non se puido analizar o ficheiro de publicación %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Non hai seccións no ficheiro de publicación %s"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Non hai entrada de Hash no ficheiro de publicación %s"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "A entrada «Valid-Until» no ficheiro de publicación %s non é válida"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "A entrada «Date» no ficheiro de publicación %s non é válida"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Liña %lu mal construída na lista de fontes %s ([opción] non analizábel)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Liña %lu mal construída na lista de fontes %s ([opción] demasiado curta)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Liña %lu mal construída na lista de fontes %s ([%s] non é unha asignación)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Liña %lu mal construída na lista de fontes %s ([%s] non ten chave)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Liña %lu mal construída na lista de fontes %s ([%s] a chave %s non ten valor)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Liña %lu mal construída na lista de orixes %s (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Liña %lu mal construída na lista de orixes %s (dist)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construindo a árbore de dependencias"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Liña %lu mal construída na lista de orixes %s (análise de URI)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versións candidatas"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Liña %lu mal construída na lista de orixes %s (dist absoluta)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Xeración de dependencias"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Liña %lu mal construída na lista de orixes %s (análise de dist)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lendo a información do estado"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "Abrindo %s"
+msgid "Failed to open StateFile %s"
+msgstr "Non foi posíbel abrir o ficheiro de estado %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Liña %u mal construída na lista de orixes %s (tipo)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, 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 orixes %s"
-
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "O tipo «%s» non se coñece na liña %u da lista de orixes %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Non é posíbel analizar o ficheiro de paquetes %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2984,50 +2959,50 @@ msgstr "Non se atopou a publicación «%s» de «%s»"
msgid "Version '%s' for '%s' was not found"
msgstr "Non se atopou a versión «%s» de «%s»"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Non foi posíbel atopar a tarefa «%s»"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Non é posíbel seleccionar distintas versións do paquete «%s» xa que é "
"puramente virtual"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Non é posíbel seleccionar a versión máis recente do paquete «%s» xa que é "
"puramente virtual"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Non é posíbel seleccionar a versión candidata do paquete %s xa que non ten "
"candidata"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Non é posíbel seleccionar a versión instalada do paquete %s xa que non está "
"instalado"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3036,184 +3011,59 @@ msgstr ""
"Non é posíbel seleccionar nin a versión instalada nin a candidata do paquete "
"«%s» xa que non ten ningunha delas"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Instalando %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Configurando %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Retirando %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "%s completamente retirado"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Tomando nota da desaparición de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Executando o disparador de post-instalación %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Falta o directorio «%s»"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Non foi posíbel abrir o ficheiro «%s»"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Preparando %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Unpacking %s"
-msgstr "Desempaquetando %s"
+msgid "Unable to parse Release file %s"
+msgstr "Non se puido analizar o ficheiro de publicación %s"
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Preparing to configure %s"
-msgstr "Preparandose para configurar %s"
+msgid "No sections in Release file %s"
+msgstr "Non hai seccións no ficheiro de publicación %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Installed %s"
-msgstr "Instalouse %s"
+msgid "No Hash entry in Release file %s"
+msgstr "Non hai entrada de Hash no ficheiro de publicación %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Preparándose para o retirado de %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "A entrada «Valid-Until» no ficheiro de publicación %s non é válida"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Removed %s"
-msgstr "Retirouse %s"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "A entrada «Date» no ficheiro de publicación %s non é válida"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Preparándose para retirar %s completamente"
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Completely removed %s"
-msgstr "Retirouse %s completamente"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Non é posíbel escribir en %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-"Non se escribiu ningún informe de Apport porque xa se acadou o nivel "
-"MaxReports"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "problemas de dependencias - déixase sen configurar"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica que "
-"é un error provinte dun fallo anterior."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
-"erro de disco cheo."
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Non se escribiu un informe de contribución porque a mensaxe de erro indica "
-"un erro de falta de memoria"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
-"erro de disco cheo."
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
-"erro de E/S en dpkg"
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Non é posíbel bloquear o directorio de administración (%s). Esta usandoo "
-"algún outro proceso?"
+msgid "%limin %lis"
+msgstr "%limin %lis"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Non é posíbel bloquear o directorio de administración (%s). É o "
-"administrador?"
+msgid "%lis"
+msgstr "%lis"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"dpkg interrompeuse, debe executar manualmente «%s» para corrixir o problema. "
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Non está bloqueado"
+msgid "Selection %s not found"
+msgstr "Non se atopou a selección %s"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3351,35 +3201,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Feito"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Non se atopou a selección %s"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Non é posíbel facer mmap sobre un ficheiro baleiro"
@@ -3445,112 +3266,286 @@ msgstr "Non é posíbel analizar o punto de montaxe %s"
msgid "Failed to stat the cdrom"
msgstr "Non foi posíbel analizar o CD-ROM"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Abreviatura de tipo «%c» descoñecida"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Abrindo o ficheiro de configuración %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Produciuse un erro de sintaxe %s:%u: O bloque comeza sen un nome."
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Produciuse un erro de sintaxe %s:%u: Etiqueta mal formada"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Produciuse un erro de sintaxe %s:%u: Lixo extra despois do valor"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Produciuse un erro de sintaxe %s:%u: Só se poden facer directivas no nivel "
"superior"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Produciuse un erro de sintaxe %s:%u: Includes aniñados de máis"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Produciuse un erro de sintaxe %s:%u: Incluído de aquí"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Produciuse un erro de sintaxe %s:%u: Non se admite a directiva «%s»"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Produciuse un erro de sintaxe %s:%u: a directiva «clear» require unha árbore "
"de opción como argumento"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Produciuse un erro de sintaxe %s:%u: Lixo extra á fin da liña"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, 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:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, 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:171
+#: apt-pkg/contrib/cmndline.cc:174
#, 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:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "A opción %s precisa dun argumento."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
"Opción %s: A especificación de elemento de configuración debe ter un =<val>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, 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:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "A opción «%s» é longa de máis"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, 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:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Operación incorrecta: %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Instalando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Configurando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Retirando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "%s completamente retirado"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Tomando nota da desaparición de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Executando o disparador de post-instalación %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Falta o directorio «%s»"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Non foi posíbel abrir o ficheiro «%s»"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Preparando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Desempaquetando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Preparandose para configurar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "Instalouse %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Preparándose para o retirado de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "Retirouse %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Preparándose para retirar %s completamente"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "Retirouse %s completamente"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Non é posíbel escribir en %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+"Non se escribiu ningún informe de Apport porque xa se acadou o nivel "
+"MaxReports"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "problemas de dependencias - déixase sen configurar"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica que "
+"é un error provinte dun fallo anterior."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
+"erro de disco cheo."
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Non se escribiu un informe de contribución porque a mensaxe de erro indica "
+"un erro de falta de memoria"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
+"erro de disco cheo."
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
+"erro de E/S en dpkg"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Non é posíbel bloquear o directorio de administración (%s). Esta usandoo "
+"algún outro proceso?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+"Non é posíbel bloquear o directorio de administración (%s). É o "
+"administrador?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"dpkg interrompeuse, debe executar manualmente «%s» para corrixir o problema. "
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Non está bloqueado"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "Chamouse a DropNode nun nodo aínda ligado"
@@ -3655,7 +3650,7 @@ msgstr "Este non é un arquivo DEB correcto, falta o membro «%s»"
msgid "Internal error, could not locate member %s"
msgstr "Produciuse un erro interno, non foi posíbel atopar o membro %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Ficheiro de control non analizábel"
@@ -3684,23 +3679,23 @@ msgstr "O arquivo é curto de máis"
msgid "Failed to read the archive headers"
msgstr "Non foi posíbel ler as cabeceiras dos arquivos"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Non foi posíbel crear as canles"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Non foi posíbel executar gzip "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Arquivo danado"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "A suma de comprobación do arquivo tar non coincide, está danado"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Tipo de cabeceira TAR %u descoñecido, membro %s"
diff --git a/po/he.po b/po/he.po
index 8175d0ebb..ab7b50745 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1188,19 +1188,23 @@ msgid ""
msgstr ""
#: cmdline/acqprogress.cc:55
-msgid "Hit "
+#, c-format
+msgid "Hit:%lu %s"
msgstr ""
#: cmdline/acqprogress.cc:79
-msgid "Get:"
+#, c-format
+msgid "Get:%lu %s"
msgstr ""
#: cmdline/acqprogress.cc:110
-msgid "Ign "
+#, c-format
+msgid "Ign:%lu %s"
msgstr ""
#: cmdline/acqprogress.cc:114
-msgid "Err "
+#, c-format
+msgid "Err:%lu %s"
msgstr ""
#: cmdline/acqprogress.cc:135
@@ -2259,12 +2263,7 @@ msgstr "כשלון בפענוח %s"
#: 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)"
+msgid "Unable to parse package file %s (%d)"
msgstr ""
#: apt-pkg/sourcelist.cc:90
diff --git a/po/hu.po b/po/hu.po
index c07c21c84..635184c75 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt trunk\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2012-06-25 17:09+0200\n"
"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
"Language-Team: Hungarian <gnome-hu-list@gnome.org>\n"
@@ -26,145 +26,145 @@ msgstr ""
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:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Csomagnevek összesen : "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Csomagstruktúrák összesen: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Normális csomagok: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Teljesen virtuális csomagok: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Egyedi virtuális csomagok: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Vegyes virtuális csomagok: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Hiányzik: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Különböző verziók összesen: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Összes különböző leírás: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Függőségek összesen: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Verzió/Fájl kapcsolatok összesen: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Leírás/Fájl kapcsolatok összesen: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "„Biztosítja” kapcsolatok összesen: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Minták összesen: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Slack terület összesen: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Nyilvántartott terület összesen: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "%s csomagfájl nincs szinkronban."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Nem találhatók csomagok"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Legalább egy keresési mintát meg kell adnia"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Ez a parancs elavult. Használja helyette az „apt-mark showauto”-t."
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Ez a csomag nem található: %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Csomagfájlok:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
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 csomagfájlra"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Rögzített csomagok:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(nem található)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Telepítve: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Jelölt: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(nincs)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Csomagrögzítés: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Verziótáblázat:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s erre: %s lefordítva ekkor: %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -235,20 +235,20 @@ msgstr ""
"Lásd az apt-cache(8) és apt.conf(5) kézikönyvlapokat további "
"információkért.\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Adja meg a lemez nevét, mint például „Debian 5.0.3 1. lemez”"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Helyezzen be egy lemezt a meghajtóba, és nyomja meg az Entert"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "„%s” csatolása a(z) „%s” könyvtárba meghiúsult"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -256,7 +256,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Ismételje meg a folyamatot készlete többi CD-jével is."
@@ -291,49 +291,49 @@ 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-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "„%s” kiválasztása forráscsomagként „%s” helyett\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
"A(z) „%2$s” csomag el nem érhető „%1$s” verziójának figyelmen kívül hagyása"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Az alábbi csomag nem található: %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s kézi telepítésűre állítva.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s megjelölve automatikusan telepítettként.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -341,30 +341,25 @@ msgstr ""
"Ez a parancs elavult. Használja helyette az „apt-mark auto” és az „apt-mark "
"auto” parancsokat."
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Belső hiba, a problémamegoldó hibát okozott"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "%s könyvtár zárolása sikertelen"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Nem lehet zárolni a letöltési könyvtárat"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nem található forráscsomag ehhez: %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -374,7 +369,7 @@ msgstr ""
"karbantartva:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -385,69 +380,69 @@ msgstr ""
"bzr branch %s\n"
"a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "A már letöltött „%s” fájl kihagyása\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Letöltendő forrásadat-mennyiség: %sB/%sB.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Letöltendő forrásadat-mennyiség: %sB.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Forrás letöltése: %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Nem sikerült néhány archívumot letölteni."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
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:945
+#: cmdline/apt-get.cc:929
#, 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:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "„%s” kibontási parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "„%s” elkészítési parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Hiba a gyermekfolyamatnál"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Legalább egy csomagot adjon meg, amelynek fordítási függőségeit ellenőrizni "
"kell"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -456,27 +451,27 @@ msgstr ""
"Nem érhetők el architektúrainformációk ehhez: %s. A beállításokkal "
"kapcsolatban lásd az apt.conf(5) APT::Architectures részét."
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Nem sikerült az építési függőségeket feldolgozni"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nem lehet %s fordítási függőségeinek információit letölteni"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, 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:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -485,7 +480,7 @@ msgstr ""
"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s nem "
"engedélyezett a(z) „%4$s” csomagokon"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -494,14 +489,14 @@ msgstr ""
"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag nem "
"található"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"%2$s csomag %1$s függősége nem elégíthető ki: a telepített %3$s csomag túl "
"friss"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -510,7 +505,7 @@ msgstr ""
"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomag elérhető "
"verziója nem elégíti ki a verziókövetelményeket"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -519,17 +514,17 @@ msgstr ""
"%2$s csomag %1$s függősége nem elégíthető ki, mert a(z) %3$s csomagnak nincs "
"jelölt verziója"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s csomag %1$s függősége nem elégíthető ki: %3$s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s építési függőségei nem elégíthetők ki."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Nem sikerült az építési függőségeket feldolgozni"
@@ -641,11 +636,11 @@ msgid "Must specify at least one pair url/filename"
msgstr ""
"Legalább egy csomagot meg kell adni, amelynek a forrását le kell tölteni"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -659,52 +654,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "%s nem jelölhető meg, mivel nincs telepítve.\n"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s már be van állítva kézi telepítésűre.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s már meg van jelölve automatikusan telepítettként.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr "%s már be van állítva visszafogásra.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr "%s eddig sem volt visszafogva.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Nem található a(z) %s, a várakozás után sem"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr "%s beállítva visszafogásra.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "Visszafogás törölve ezen: %s.\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr "A dpkg futtatása sikertelen. Van root jogosultsága?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -950,7 +946,7 @@ msgstr "Az adatfoglalathoz kapcsolódás túllépte az időkorlátot"
msgid "Unable to accept connection"
msgstr "Nem lehet elfogadni a kapcsolatot"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Probléma a fájl hash értékének meghatározásakor"
@@ -1039,38 +1035,38 @@ msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Nem lehet csatlakozni ehhez: %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Belső hiba: Jó aláírás, de nem állapítható meg a kulcs ujjlenyomata."
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Legalább egy aláírás érvénytelen."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"Nem indítható el a „apt-key” az aláírás ellenőrzéséhez (telepítve van a "
"gnupg?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Ismeretlen apt-key futtatási hiba"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Az alábbi aláírások érvénytelenek voltak:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1082,31 +1078,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr "Az üres fájlok biztosan nem érvényes csomagok"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Hiba a fájl írásakor"
-#: methods/http.cc:529
+#: methods/http.cc:531
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:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Hiba a kiszolgálóról olvasáskor"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Hiba a fájl írásakor"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "A kiválasztás sikertelen"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Időtúllépés a kapcsolatban"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Hiba a kimeneti fájl írásakor"
@@ -1114,53 +1110,298 @@ msgstr "Hiba a kimeneti fájl írásakor"
msgid "Waiting for headers"
msgstr "Várakozás a fejlécekre"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Rossz fejlécsor"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "A HTTP-kiszolgáló érvénytelen válaszfejlécet küldött"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "A HTTP-kiszolgáló érvénytelen Content-Length fejlécet küldött"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "A HTTP-kiszolgáló érvénytelen Content-Range fejlécet küldött"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "A HTTP-kiszolgáló tartománytámogatása sérült"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Ismeretlen dátumformátum"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Rossz fejlécadatok"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Sikertelen kapcsolódás"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Belső hiba"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Függőségek javítása..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " sikertelen."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Nem lehet javítani a függőségeket"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Kész"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Próbálja futtatni az „apt-get -f install” parancsot ezek javításához."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Teljesítetlen függőségek. Próbálja a -f használatával."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Telepítve]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Telepítve]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Telepítve]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Telepítve]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "de %s van telepítve"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "de csak %s telepíthető"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "de az nem telepíthető"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "de az egy virtuális csomag"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "de az nincs telepítve"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "de az nincs telepítésre megjelölve"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " vagy"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Az alábbi csomagok vissza lesznek tartva:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Az alábbi csomagok frissítve lesznek:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Az alábbi visszafogott csomagokat cserélem:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (%s miatt) "
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n"
+"NE tegye ezt, hacsak nem tudja pontosan, mit csinál!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu frissített, %lu újonnan telepített, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu újratelepítendő, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu visszafejlesztendő, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu eltávolítandó és %lu nem frissített.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[I/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[i/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "I"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex fordítási hiba - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Az update parancsnak nincsenek argumentumai"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"NE FELEDJE: Ez csak szimuláció!\n"
+" Az apt-get rendszergazdai jogokat igényel a tényleges végrehajtáshoz.\n"
+" Ne feledje, hogy a zárolás is ki van kapcsolva,\n"
+" így ne számítson a jelenlegi helyzet valósságára!"
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!"
@@ -1420,251 +1661,6 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr "A(z) „%s” csomag nincs telepítve, így nem lett törölve\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Függőségek javítása..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " sikertelen."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Nem lehet javítani a függőségeket"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Nem lehet minimalizálni a frissítendő csomagok mennyiségét"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Kész"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Próbálja futtatni az „apt-get -f install” parancsot ezek javításához."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Teljesítetlen függőségek. Próbálja a -f használatával."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Telepítve]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Telepítve]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Telepítve]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Telepítve]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "de %s van telepítve"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "de csak %s telepíthető"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "de az nem telepíthető"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "de az egy virtuális csomag"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "de az nincs telepítve"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "de az nincs telepítésre megjelölve"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " vagy"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Az alábbi ÚJ csomagok lesznek telepítve:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Az alábbi csomagok vissza lesznek tartva:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Az alábbi csomagok frissítve lesznek:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Az alábbi csomagok VISSZAFEJLESZTÉSRE kerülnek:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Az alábbi visszafogott csomagokat cserélem:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (%s miatt) "
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"FIGYELMEZTETÉS: Az alábbi alapvető csomagok el lesznek távolítva.\n"
-"NE tegye ezt, hacsak nem tudja pontosan, mit csinál!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu frissített, %lu újonnan telepített, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu újratelepítendő, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu visszafejlesztendő, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu eltávolítandó és %lu nem frissített.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nincs teljesen telepítve/eltávolítva.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[I/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[i/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "I"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex fordítási hiba - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Az update parancsnak nincsenek argumentumai"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"NE FELEDJE: Ez csak szimuláció!\n"
-" Az apt-get rendszergazdai jogokat igényel a tényleges végrehajtáshoz.\n"
-" Ne feledje, hogy a zárolás is ki van kapcsolva,\n"
-" így ne számítson a jelenlegi helyzet valósságára!"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1718,20 +1714,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Találat "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Találat:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Letöltés:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Letöltés:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Mellőz "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Mellőz:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Hiba "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Hiba:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1757,17 +1757,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "%s nem olvasható"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1841,7 +1841,7 @@ msgstr "előtti hibák fontosak. Javítsa azokat, és futtassa az [I]nstallt új
msgid "Merging available information"
msgstr "Elérhető információk egyesítése"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1866,46 +1866,46 @@ 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:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "%s nem érhető el"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Nem lehet írni ebbe: %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
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:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "A csomagkiterjesztések listája túl hosszú"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Hiba a(z) %s könyvtár feldolgozásakor"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "A forráskiterjesztések listája túl hosszú"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Hiba a tartalomfájl fejlécének írásakor"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Hiba %s tartalmának feldolgozásakor"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1987,11 +1987,11 @@ 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:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Nincs illeszkedő kiválasztás"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, 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ájlcsoportból"
@@ -2103,22 +2103,22 @@ msgstr " a DeLink korlátja (%sB) elérve.\n"
msgid "Archive had no package field"
msgstr "Az archívumnak nem volt csomag mezője"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s karbantartója %s, nem %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, 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:724
+#: ftparchive/writer.cc:716
#, 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"
@@ -2204,7 +2204,7 @@ msgstr "Hiba %s törlésekor"
msgid "Failed to rename %s to %s"
msgstr "„%s” átnevezése sikertelen erre: %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2229,11 +2229,11 @@ msgstr ""
" -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Ismeretlen csomagbejegyzés!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2306,6 +2306,28 @@ msgstr "%s hitelesítési rekordja nem található"
msgid "Hash mismatch for: %s"
msgstr "%s ellenőrzőösszege nem megfelelő"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "A(z) %s metódusvezérlő nem található."
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "A(z) %s metódus nem indult el megfelelően"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Helyezze be a(z) „%s” címkéjű lemezt a(z) „%s” meghajtóba, és nyomja meg az "
+"Entert."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2320,178 +2342,310 @@ msgstr "Próbálja futtatni az „apt-get update” parancsot ezen hibák javít
msgid "The list of sources could not be read."
msgstr "A források listája olvashatatlan."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Üres csomaggyorsítótár"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "A csomaggyorsítótár fájl megsérült"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "A csomaggyorsítótár-fájl inkompatibilis verziójú"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr "A csomaggyorsítótár-fájl sérült, túl kicsi"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, 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:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "A csomaggyorsítótár egy másik architektúrához készült"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Függ ettől"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Függ ettől (előfüggés)"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Javasolja"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Ajánlja"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Ütközik"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Kicseréli"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Elavulttá teszi"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Töri"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Bővíti"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "fontos"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "szükséges"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "szabványos"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "opcionális"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "extra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Frissítés kiszámítása"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "A(z) %s metódusvezérlő nem található."
+msgid "Index file type '%s' is not supported"
+msgstr "A(z) „%s” indexfájltípus nem támogatott"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Ellenőrizze, hogy a „dpkg-dev” csomag telepítve van-e.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "A(z) %s metódus nem indult el megfelelően"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] "
+"feldolgozhatatlan)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-"Helyezze be a(z) „%s” címkéjű lemezt a(z) „%s” meghajtóba, és nyomja meg az "
-"Entert."
+"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] túl "
+"rövid)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem "
+"érvényes hozzárendelés)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem "
+"tartalmaz kulcsot)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] %s kulcsnak "
+"nincs értéke)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (Abszolút dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist feldolgozás)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s megnyitása"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "A(z) %u. sor túl hosszú a(z) %s forráslistában."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "A(z) „%s” indexfájltípus nem támogatott"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Függőségi fa építése"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s nem érhető el."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Lehetséges verziók"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "A gyorsítótárnak inkompatibilis verziórendszere van"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Függőséggenerálás"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Hiba történt a(z) %s feldolgozása során (%s%d)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Állapotinformációk olvasása"
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Az APT által kezelhető csomagnevek száma túllépve."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Az APT által kezelhető csomagverziók száma túllépve."
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Az APT által kezelhető csomagleírások száma túllépve."
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Az APT által kezelhető függőségek száma túllépve."
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s állapotfájl megnyitása sikertelen"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+"A(z) %s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása "
+"közben"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s átmeneti állapotfájl írása sikertelen"
+msgid "Couldn't stat source package list %s"
+msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Csomaglisták olvasása"
+
+# FIXME
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "„Biztosítja” kapcsolatok összegyűjtése"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "IO hiba a forrás-gyorsítótár mentésekor"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "A helyzet elküldése a solvernek"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Kérés küldése a solvernek"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Felkészülés megoldás fogadására"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "A külső solver megfelelő hibaüzenet nélkül hibázott"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "Külső solver végrehajtása"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "sikertelen átnevezés, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "A Hash Sum nem megfelelő"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "A méret nem megfelelő"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "%s érvénytelen művelet"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Írási hiba"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
#, fuzzy
msgid "Does not start with a cleartext signature"
msgstr "A(z) %s fájl nem digitálisan aláírt üzenettel kezdődik"
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2501,7 +2655,7 @@ msgstr ""
"előző indexfájl lesz használva. GPG hiba: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG hiba: %s: %s"
@@ -2517,14 +2671,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2533,16 +2687,16 @@ msgstr ""
"A várt „%s” bejegyzés nem található a Release fájlban (Rossz sources.list "
"bejegyzés vagy helytelenül formázott fájl)"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nem található a(z) „%s” ellenőrzőösszege a Release fájlban"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nem érhető el nyilvános kulcs az alábbi kulcsazonosítókhoz:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2551,19 +2705,19 @@ msgstr ""
"A Release fájl elavult ehhez: %s (érvénytelen ez óta: %s). A tároló "
"frissítései nem kerülnek alkalmazásra."
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2572,127 +2726,54 @@ msgstr ""
"Egy fájl nem található a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
"kell kijavítani a csomagot. (hiányzó arch. miatt)"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Nem található forrás a(z) „%2$s” „%1$s” verziójának letöltéséhez"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"A csomagindexfájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "A gyorsítótárnak inkompatibilis verziórendszere van"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Hiba történt a(z) %s feldolgozása során (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Az APT által kezelhető csomagnevek száma túllépve."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Az APT által kezelhető csomagverziók száma túllépve."
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Az APT által kezelhető csomagleírások száma túllépve."
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Az APT által kezelhető függőségek száma túllépve."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-"A(z) %s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása "
-"közben"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Csomaglisták olvasása"
-
-# FIXME
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "„Biztosítja” kapcsolatok összegyűjtése"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "IO hiba a forrás-gyorsítótár mentésekor"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "A(z) %s terjesztőblokk nem tartalmaz ujjlenyomatot"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "A(z) %spartial listakönyvtár hiányzik."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "A(z) %spartial archívumkönyvtár hiányzik."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "A(z) „%s” indexfájltípus nem támogatott"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "%s könyvtár zárolása sikertelen"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "%li/%li fájl letöltése (%s marad)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "%li/%li fájl letöltése"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Néhány indexfájlt nem sikerült letölteni. Figyelmen kívül lettek hagyva, "
-"vagy régebbiek lettek felhasználva."
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Néhány „source” URI-t el kell helyezni a sources.list fájlban"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s nem érhető el."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2716,7 +2797,7 @@ msgstr "A(z) %s rögzítéstípus nem értelmezhető"
msgid "No priority (or zero) specified for pin"
msgstr "Nincs prioritás (vagy nulla) megadva a rögzítéshez"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2725,12 +2806,12 @@ msgstr ""
"Nem lehetett a(z) „%s” közvetlen beállítását végrehajtani. A részletekért "
"lásd a man 5 apt.conf oldalt az APT::Immediate-Configure címszó alatt. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr "A(z) „%s” beállítása sikertelen"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2741,10 +2822,13 @@ msgstr ""
"eltávolítását, ami ütközési/előfüggőségi hurkot okoz. Ez gyakran rossz, de "
"ha tényleg ezt akarja tenni, aktiválja az APT::Force-LoopBreak opciót."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "A(z) %u. sor túl hosszú a(z) %s forráslistában."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Néhány indexfájlt nem sikerült letölteni. Figyelmen kívül lettek hagyva, "
+"vagy régebbiek lettek felhasználva."
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2815,11 +2899,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Csomaglisták másolása..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Új forráslista írása\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "A lemezhez tartozó forráslistabejegyzések a következők:\n"
@@ -2830,7 +2914,7 @@ msgid ""
msgstr ""
"A(z) %s csomagot újra kell telepíteni, de nem található hozzá archívum."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2838,149 +2922,40 @@ msgstr ""
"Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott "
"csomagok okozhatják."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "A problémák nem javíthatók, sérült csomagokat fogott vissza."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "A helyzet elküldése a solvernek"
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr "Kérés küldése a solvernek"
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr "Felkészülés megoldás fogadására"
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr "A külső solver megfelelő hibaüzenet nélkül hibázott"
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr "Külső solver végrehajtása"
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "A(z) %s Release fájl nem dolgozható fel"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "A(z) %s Release fájl nem tartalmaz szakaszokat"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Nincs Hash bejegyzés a(z) %s Release fájlban"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Érvénytelen „Valid-Until” bejegyzés a(z) %s Release fájlban"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Érvénytelen „Date” bejegyzés a(z) %s Release fájlban"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] "
-"feldolgozhatatlan)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában (az [option] túl "
-"rövid)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem "
-"érvényes hozzárendelés)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] nem "
-"tartalmaz kulcsot)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Helytelenül formázott a(z) %lu. sor a(z) %s forráslistában ([%s] %s kulcsnak "
-"nincs értéke)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Függőségi fa építése"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (URI-feldolgozás)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Lehetséges verziók"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (Abszolút dist)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Függőséggenerálás"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "A(z) %lu. sor hibás a(z) %s forráslistában (dist feldolgozás)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Állapotinformációk olvasása"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "%s megnyitása"
+msgid "Failed to open StateFile %s"
+msgstr "%s állapotfájl megnyitása sikertelen"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s átmeneti állapotfájl írása sikertelen"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában"
-
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "„%1$s” típus nem ismert a(z) %3$s forráslista %2$u. sorában"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2992,45 +2967,45 @@ msgstr "„%s” kiadás nem található ehhez: „%s”"
msgid "Version '%s' for '%s' was not found"
msgstr "„%s” verzió nem található ehhez: „%s”"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "„%s” feladat nem található"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Nem található csomag a(z) „%s” reguláris kifejezéssel"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "„%s” csomagból nem választható verzió, mert teljesen virtuális"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"„%s” csomag legújabb verziója nem választható ki, mert teljesen virtuális"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"„%s” csomag kiadásra jelölt verziója nem választható ki, mert nincs jelöltje"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"„%s” csomag telepített verziója nem választható ki, mert nincs telepítve"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3039,180 +3014,59 @@ msgstr ""
"„%s” csomagból nem választható sem telepített, sem kiadásra jelölt verzió, "
"mert egyikkel sem rendelkezik"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "%s telepítése"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "%s konfigurálása"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "%s eltávolítása"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "%s teljes eltávolítása"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "„%s” eltűnése feljegyezve"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "A(z) %s telepítés utáni trigger futtatása"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "A(z) „%s” könyvtár hiányzik"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "A(z) „%s” fájl megnyitása sikertelen"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "%s előkészítése"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Unpacking %s"
-msgstr "%s kicsomagolása"
+msgid "Unable to parse Release file %s"
+msgstr "A(z) %s Release fájl nem dolgozható fel"
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Preparing to configure %s"
-msgstr "%s konfigurálásának előkészítése"
+msgid "No sections in Release file %s"
+msgstr "A(z) %s Release fájl nem tartalmaz szakaszokat"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Installed %s"
-msgstr "%s telepítve"
+msgid "No Hash entry in Release file %s"
+msgstr "Nincs Hash bejegyzés a(z) %s Release fájlban"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "%s eltávolításának előkészítése"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Érvénytelen „Valid-Until” bejegyzés a(z) %s Release fájlban"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Removed %s"
-msgstr "%s eltávolítva"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Érvénytelen „Date” bejegyzés a(z) %s Release fájlban"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "%s teljes eltávolításának előkészítése"
+msgid "%lid %lih %limin %lis"
+msgstr "%lin %lió %lip %limp"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Completely removed %s"
-msgstr "%s teljesen eltávolítva"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Nem lehet írni ebbe: %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr "A művelet megszakadt, mielőtt befejeződhetett volna"
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr "Nem került írásra apport jelentés, mivel a MaxReports már elérve"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "függőségi hibák - a csomag beállítatlan maradt"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint ez a hiba "
-"egy korábbi hiba következménye."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint megtelt a "
-"lemez"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Nem került kiírásra apport jelentés, mivel a hibaüzenet memóriaelfogyási "
-"hibát jelez"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Nem került kiírásra apport jelentés, mert a hibaüzenet a helyi rendszeren "
-"lévő hibát jelez"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Nem került kiírásra apport jelentés, mert a hibaüzenet dpkg I/O hibát jelez"
+msgid "%lih %limin %lis"
+msgstr "%lió %lip %limp"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Az adminisztrációs könyvtár (%s) nem zárolható, lehet hogy másik folyamat "
-"használja?"
+msgid "%limin %lis"
+msgstr "%lip %limp"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Az adminisztrációs könyvtár (%s) nem zárolható, rendszergazdaként próbálja?"
+msgid "%lis"
+msgstr "%limp"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"A dpkg megszakadt, saját kezűleg kell futtatnia a(z) „%s” parancsot a "
-"probléma megoldásához. "
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Nincs zárolva"
+msgid "Selection %s not found"
+msgstr "%s kiválasztás nem található"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3352,35 +3206,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Kész"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lin %lió %lip %limp"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lió %lip %limp"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%lip %limp"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%limp"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "%s kiválasztás nem található"
-
# FIXME
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
@@ -3446,110 +3271,280 @@ msgstr "%s csatolási pont nem érhető el"
msgid "Failed to stat the cdrom"
msgstr "Nem sikerült elérni a CD-ROM-ot."
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Ismeretlen típusrövidítés: „%c”"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "%s konfigurációs fájl megnyitása"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, 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:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Szintaktikai hiba %s: %u: rosszul formázott címke"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, 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:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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:881
+#: apt-pkg/contrib/configuration.cc:887
#, 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:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, 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:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Szintaktikai hiba %s:%u: a törlési parancs egy beállítási fát vár "
"argumentumként"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, 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/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "A(z) „%c” parancssori kapcsoló [a következőből: %s] ismeretlen."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "%s parancssori kapcsoló értelmezhetetlen"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "%s parancssori kapcsoló nem logikai"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "%s kapcsolóhoz argumentum szükséges."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
"%s kapcsoló: a konfigurációs elem megadásához szükséges egy =<érték> rész."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "%s kapcsoló egész, és nem „%s” típusú argumentumot követel meg"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Túl hosszú „%s” kapcsoló"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "%s jelentés nem értelmezhető, próbálja a true vagy false értékeket."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "%s érvénytelen művelet"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "%s telepítése"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "%s konfigurálása"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "%s eltávolítása"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "%s teljes eltávolítása"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "„%s” eltűnése feljegyezve"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "A(z) %s telepítés utáni trigger futtatása"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "A(z) „%s” könyvtár hiányzik"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "A(z) „%s” fájl megnyitása sikertelen"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "%s előkészítése"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "%s kicsomagolása"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "%s konfigurálásának előkészítése"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "%s telepítve"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, 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:1016
+#, c-format
+msgid "Removed %s"
+msgstr "%s eltávolítva"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "%s teljes eltávolításának előkészítése"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s teljesen eltávolítva"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Nem lehet írni ebbe: %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "A művelet megszakadt, mielőtt befejeződhetett volna"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr "Nem került írásra apport jelentés, mivel a MaxReports már elérve"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "függőségi hibák - a csomag beállítatlan maradt"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint ez a hiba "
+"egy korábbi hiba következménye."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Nem került kiírásra apport jelentés, mivel a hibaüzenet szerint megtelt a "
+"lemez"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Nem került kiírásra apport jelentés, mivel a hibaüzenet memóriaelfogyási "
+"hibát jelez"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Nem került kiírásra apport jelentés, mert a hibaüzenet a helyi rendszeren "
+"lévő hibát jelez"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Nem került kiírásra apport jelentés, mert a hibaüzenet dpkg I/O hibát jelez"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Az adminisztrációs könyvtár (%s) nem zárolható, lehet hogy másik folyamat "
+"használja?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+"Az adminisztrációs könyvtár (%s) nem zárolható, rendszergazdaként próbálja?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"A dpkg megszakadt, saját kezűleg kell futtatnia a(z) „%s” parancsot a "
+"probléma megoldásához. "
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Nincs zárolva"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "A DropNode hívása egy még mindig linkelt node-ra történt"
@@ -3654,7 +3649,7 @@ msgstr "Ez nem egy érvényes DEB archívum, hiányzik a(z) „%s” tag"
msgid "Internal error, could not locate member %s"
msgstr "Belső hiba, %s tag nem található"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Értelmezhetetlen control fájl"
@@ -3683,23 +3678,23 @@ msgstr "Az archívum túl rövid"
msgid "Failed to read the archive headers"
msgstr "Nem sikerült olvasni az archívumfejléceket"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Nem sikerült adatcsatornákat létrehozni"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Nem sikerült a gzipet futtatni "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Hibás archívum"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar ellenőrzőösszeg nem egyezik, az archívum megsérült"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Ismeretlen a(z) %u TAR fejléctípus, %s tag"
diff --git a/po/it.po b/po/it.po
index 3a8c21403..178754c52 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,15 +1,15 @@
# Italian translation of apt
-# Copyright (C) 2002-2010, 2011, 2012, 2013, 2014 The Free Software Foundation, Inc.
+# Copyright (C) 2002-2010, 2011, 2012, 2013, 2014, 2015 The Free Software Foundation, Inc.
# This file is distributed under the same license as the apt package.
# Samuele Giovanni Tonon <samu@debian.org>, 2002.
-# Milo Casagrande <milo@ubuntu.com>, 2009, 2010, 2011, 2012, 2013, 2014.
+# Milo Casagrande <milo@milo.name>, 2009, 2010, 2011, 2012, 2013, 2014, 2015.
#
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
-"PO-Revision-Date: 2014-05-31 17:04+0100\n"
+"POT-Creation-Date: 2015-04-11 08:08+0200\n"
+"PO-Revision-Date: 2015-04-07 16:51+0100\n"
"Last-Translator: Milo Casagrande <milo@milo.name>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"Language: it\n"
@@ -18,153 +18,143 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"X-Launchpad-Export-Date: 2012-06-25 19:48+0000\n"
-"X-Generator: Poedit 1.6.5\n"
#: cmdline/apt-cache.cc:149
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Il pacchetto %s versione %s ha una dipendenza non soddisfatta:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Totale nomi dei pacchetti: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Totale strutture dei pacchetti: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Pacchetti normali: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Pacchetti virtuali puri: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Pacchetti virtuali singoli: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Pacchetti virtuali misti: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Mancante: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Totale versioni distinte: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Totale descrizioni distinte: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Totale dipendenze: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Totale relazioni ver/file: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Totale relazioni desc/file: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Totale corrispondenze fornite: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Totale stringhe globalizzate: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Totale spazio inutilizzato: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Totale spazio occupato: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Il file dei pacchetti %s non è sincronizzato."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Nessun pacchetto trovato"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "È necessario specificare almeno un modello per la ricerca"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
"Questo comando è deprecato. Utilizzare \"apt-mark showauto\" al suo posto."
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Impossibile trovare il pacchetto %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "File dei pacchetti:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
"La cache non è sincronizzata, impossibile referenziare un file di pacchetti"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Pacchetti con gancio:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(non trovato)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Installato: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Candidato: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(nessuno)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Gancio del pacchetto: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Tabella versione:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
-#, c-format
-msgid "%s %s for %s compiled on %s %s\n"
-msgstr "%s %s per %s compilato il %s %s\n"
-
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1833
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -237,20 +227,20 @@ msgstr ""
"Per maggiori informazioni, consultare le pagine di manuale apt-cache(8) e \n"
"apt.conf(5).\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Dare un nome a questo disco, tipo \"Debian 5.0.3 Disco 1\""
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Inserire un disco nell'unità e premere Invio"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Mount di \"%s\" su \"%s\" non riuscito"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -264,7 +254,7 @@ msgstr ""
"Per maggiori informazioni sull'autorilevamento e sul punto di mount\n"
"del CD-ROM, consultare \"man apt-cdrom\"."
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Ripetere questo processo per il resto dei CD."
@@ -272,7 +262,7 @@ msgstr "Ripetere questo processo per il resto dei CD."
msgid "Arguments not in pairs"
msgstr "Argomenti non in coppia"
-#: cmdline/apt-config.cc:89
+#: cmdline/apt-config.cc:88
msgid ""
"Usage: apt-config [options] command\n"
"\n"
@@ -300,48 +290,48 @@ msgstr ""
" -c=? Legge come configurazione il file specificato\n"
" -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Impossibile trovare un pacchetto per l'architettura \"%s\""
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Impossibile trovare un pacchetto \"%s\" con versione \"%s\""
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Impossibile trovare un pacchetto \"%s\" con release \"%s\""
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Scelto \"%s\" come pacchetto sorgente al posto di \"%s\"\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Impossibile trovare la versione \"%s\" del pacchetto \"%s\""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossibile trovare il pacchetto %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "È stato impostato %s per l'installazione manuale.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s impostato automaticamente come installato.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -349,30 +339,25 @@ msgstr ""
"Questo comando è deprecato. Utilizzare \"apt-mark auto\" e \"apt-mark manual"
"\" al suo posto."
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Impossibile bloccare la directory %s"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Impossibile bloccare la directory di scaricamento"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr ""
"È necessario specificare almeno un pacchetto di cui recuperare il sorgente"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossibile trovare un pacchetto sorgente per %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -382,7 +367,7 @@ msgstr ""
"all'interno del sistema di controllo della versione \"%s\" presso:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -394,69 +379,69 @@ msgstr ""
"per recuperare gli ultimi (forse non rilasciati) aggiornamenti del "
"pacchetto.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "È necessario recuperare %sB/%sB di sorgenti.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "È necessario scaricare %sB di sorgenti.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Recupero sorgente %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Recupero di alcuni archivi non riuscito."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Scaricamento completato e in modalità solo scaricamento"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando di estrazione \"%s\" non riuscito.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando \"%s\" di generazione non riuscito.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Creazione processo figlio non riuscita"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"È necessario specificare almeno un pacchetto di cui controllare le "
"dipendenze di generazione"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -465,27 +450,27 @@ msgstr ""
"Informazioni sull'architettura non disponibili per %s. Consultare apt."
"conf(5) APT::Architectures per l'impostazione"
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Elaborazione delle dipendenze di generazione non riuscita"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ha dipendenze di generazione.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -494,7 +479,7 @@ msgstr ""
"La dipendenza %s per %s non può essere soddisfatta perché %s non è "
"consentito su pacchetti \"%s\""
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -503,14 +488,14 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s "
"non può essere trovato"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, 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 recente"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -519,7 +504,7 @@ msgstr ""
"La dipendenza %s per %s non può essere soddisfatta perché la versione "
"candidata del pacchetto %s non può soddisfare i requisiti di versione"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -528,17 +513,17 @@ msgstr ""
"La dipendenza %s per %s non può essere soddisfatta perché il pacchetto %s "
"non ha una versione candidata"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "La dipendenza %s per %s non è stata soddisfatta: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Le dipendenze di generazione per %s non sono state soddisfatte."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Elaborazione delle dipendenze di generazione non riuscita"
@@ -547,11 +532,11 @@ msgstr "Elaborazione delle dipendenze di generazione non riuscita"
msgid "Changelog for %s (%s)"
msgstr "Changelog per %s (%s)"
-#: cmdline/apt-get.cc:1615
+#: cmdline/apt-get.cc:1614
msgid "Supported modules:"
msgstr "Moduli supportati:"
-#: cmdline/apt-get.cc:1656
+#: cmdline/apt-get.cc:1655
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -643,18 +628,17 @@ msgstr ""
#: cmdline/apt-helper.cc:36
msgid "Need one URL as argument"
-msgstr ""
+msgstr "Necessario un URL come argomento"
#: cmdline/apt-helper.cc:49
msgid "Must specify at least one pair url/filename"
msgstr "È necessario specificare almeno una coppia URL/nome file"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr "Scaricamento non riuscito"
-#: cmdline/apt-helper.cc:82
-#, fuzzy
+#: cmdline/apt-helper.cc:92
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -673,56 +657,58 @@ msgstr ""
"apt-helper è un programma d'aiuto interno per apt\n"
"\n"
"Comandi:\n"
-" download-file Scarica l'URI fornito in percorso\n"
+" download-file Scarica l'URI fornito in percorso\n"
+" auto-detect-proxy Rileva proxy utilizzando apt.conf\n"
"\n"
-" Questo APT ha super poteri.\n"
+" Questo APT ha super poteri.\n"
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "%s non può essere segnato perché non è installato.\n"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s è già stato impostato come installato manualmente.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s è già stato impostato come installato automaticamente.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr "%s è già stato impostato come bloccato.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr "%s era già non bloccato.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "In attesa di %s ma non era presente"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr "%s impostato come bloccato.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "Blocco su %s annullato.\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr "Esecuzione di dpkg non riuscita. È stato lanciato come root?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:449
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -775,7 +761,7 @@ msgstr ""
"Per maggiori informazioni, consultare le pagine di manuale apt-mark(8) e\n"
"apt.conf(5)."
-#: cmdline/apt.cc:47
+#: cmdline/apt.cc:46
msgid ""
"Usage: apt [options] command\n"
"\n"
@@ -842,7 +828,7 @@ msgstr "Impossibile smontare il CD-ROM in %s, potrebbe essere ancora in uso."
msgid "Disk not found."
msgstr "Disco non trovato"
-#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281
+#: methods/cdrom.cc:262 methods/file.cc:88 methods/rsh.cc:281
msgid "File not found"
msgstr "File non trovato"
@@ -851,11 +837,11 @@ msgstr "File non trovato"
msgid "Failed to stat"
msgstr "Esecuzione di stat non riuscita"
-#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
+#: methods/copy.cc:105 methods/gzip.cc:134 methods/rred.cc:605
msgid "Failed to set modification time"
msgstr "Impostazione della data di modifica non riuscita"
-#: methods/file.cc:48
+#: methods/file.cc:49
msgid "Invalid URI, local URIS must not start with //"
msgstr "URI non valido, gli URI locali non devono iniziare con //"
@@ -895,125 +881,125 @@ msgstr ""
"È stato specificato un server proxy, ma nessuno script di accesso: Acquire::"
"ftp::ProxyLogin è vuoto."
-#: methods/ftp.cc:281
+#: methods/ftp.cc:283
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr ""
"Comando dello script di accesso \"%s\" non riuscito, il server riporta: %s"
-#: methods/ftp.cc:307
+#: methods/ftp.cc:309
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE non riuscito, il server riporta: %s"
-#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
+#: methods/ftp.cc:347 methods/ftp.cc:459 methods/rsh.cc:195 methods/rsh.cc:243
msgid "Connection timeout"
msgstr "Connessione scaduta"
-#: methods/ftp.cc:351
+#: methods/ftp.cc:353
msgid "Server closed the connection"
msgstr "Il server ha chiuso la connessione"
-#: methods/ftp.cc:354 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1515
+#: methods/ftp.cc:356 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1515
#: apt-pkg/contrib/fileutl.cc:1524 apt-pkg/contrib/fileutl.cc:1529
#: apt-pkg/contrib/fileutl.cc:1531
msgid "Read error"
msgstr "Errore di lettura"
-#: methods/ftp.cc:361 methods/rsh.cc:209
+#: methods/ftp.cc:363 methods/rsh.cc:209
msgid "A response overflowed the buffer."
msgstr "Una risposta ha superato le dimensioni del buffer."
-#: methods/ftp.cc:378 methods/ftp.cc:390
+#: methods/ftp.cc:380 methods/ftp.cc:392
msgid "Protocol corruption"
msgstr "Protocollo danneggiato"
-#: methods/ftp.cc:463 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:911
+#: methods/ftp.cc:465 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:911
#: apt-pkg/contrib/fileutl.cc:1637 apt-pkg/contrib/fileutl.cc:1646
#: apt-pkg/contrib/fileutl.cc:1651 apt-pkg/contrib/fileutl.cc:1653
#: apt-pkg/contrib/fileutl.cc:1678
msgid "Write error"
msgstr "Errore di scrittura"
-#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
+#: methods/ftp.cc:704 methods/ftp.cc:710 methods/ftp.cc:745
msgid "Could not create a socket"
msgstr "Impossibile creare un socket"
-#: methods/ftp.cc:713
+#: methods/ftp.cc:715
msgid "Could not connect data socket, connection timed out"
msgstr ""
"Impossibile connettersi al socket dati, tempo esaurito per la connessione"
-#: methods/ftp.cc:717 methods/connect.cc:116
+#: methods/ftp.cc:719 methods/connect.cc:116
msgid "Failed"
msgstr "Non riuscito"
-#: methods/ftp.cc:719
+#: methods/ftp.cc:721
msgid "Could not connect passive socket."
msgstr "Impossibile connettersi alla socket passiva."
-#: methods/ftp.cc:736
+#: methods/ftp.cc:738
msgid "getaddrinfo was unable to get a listening socket"
msgstr "Impossibile ottenere un socket in ascolto con getaddrinfo()"
-#: methods/ftp.cc:750
+#: methods/ftp.cc:752
msgid "Could not bind a socket"
msgstr "Impossibile eseguire bind() su un socket"
-#: methods/ftp.cc:754
+#: methods/ftp.cc:756
msgid "Could not listen on the socket"
msgstr "Impossibile eseguire listen() su un socket"
-#: methods/ftp.cc:761
+#: methods/ftp.cc:763
msgid "Could not determine the socket's name"
msgstr "Impossibile determinare il nome del socket"
-#: methods/ftp.cc:793
+#: methods/ftp.cc:795
msgid "Unable to send PORT command"
msgstr "Impossibile inviare il comando PORT"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:805
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Famiglia di indirizzamento %u (AF_*) sconosciuta"
-#: methods/ftp.cc:812
+#: methods/ftp.cc:814
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT non riuscito, il server riporta: %s"
-#: methods/ftp.cc:832
+#: methods/ftp.cc:834
msgid "Data socket connect timed out"
msgstr "Connessione al socket dati terminata"
-#: methods/ftp.cc:839
+#: methods/ftp.cc:841
msgid "Unable to accept connection"
msgstr "Impossibile accettare connessioni"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:881 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Si è verificato un problema nel creare l'hash del file"
-#: methods/ftp.cc:892
+#: methods/ftp.cc:894
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Impossibile recuperare il file, il server riporta: \"%s\""
-#: methods/ftp.cc:907 methods/rsh.cc:338
+#: methods/ftp.cc:909 methods/rsh.cc:338
msgid "Data socket timed out"
msgstr "Socket dati terminato"
-#: methods/ftp.cc:944
+#: methods/ftp.cc:946
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Trasferimento dati non riuscito, il server riporta: \"%s\""
#. Get the files information
-#: methods/ftp.cc:1027
+#: methods/ftp.cc:1029
msgid "Query"
msgstr "Interrogazione"
-#: methods/ftp.cc:1141
+#: methods/ftp.cc:1143
msgid "Unable to invoke "
msgstr "Impossibile invocare "
@@ -1080,25 +1066,25 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr "Impossibile connettersi a %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Errore interno: firma corretta, ma non è possibile determinare l'impronta "
"della chiave."
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "È stata trovata almeno una firma non valida."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"Impossibile eseguire \"apt-key\" per verificare la firma (forse gnupg non è "
"installato)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1107,15 +1093,15 @@ msgstr ""
"Il file con la firma in chiaro non è valido, ottenuto \"%s\" (la rete "
"richiede autenticazione?)"
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Errore sconosciuto durante l'esecuzione di apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Le seguenti firme non erano valide:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1127,31 +1113,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr "File vuoti non possono essere archivi validi"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Errore nello scrivere sul file"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Errore nel leggere dal server"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Errore nello scrivere su file"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Select non riuscita"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Connessione terminata"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Errore nello scrivere sul file di output"
@@ -1159,53 +1145,300 @@ msgstr "Errore nello scrivere sul file di output"
msgid "Waiting for headers"
msgstr "In attesa degli header"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Riga header non corretta"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "Il server HTTP ha inviato un header di risposta non valido"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Il server HTTP ha inviato un header Content-Length non valido"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Il server HTTP ha inviato un header Content-Range non valido"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Questo server HTTP ha un supporto del range non corretto"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Formato della data sconosciuto"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Header dati non corretto"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Connessione non riuscita"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Errore interno"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Elencazione"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "C'è %i versione aggiuntiva: usare \"-a\" per visualizzarla"
+msgstr[1] "Ci sono %i versioni aggiuntive: usare \"-a\" per visualizzarle"
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Correzione delle dipendenze..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " non riuscita."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Impossibile correggere le dipendenze"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossibile minimizzare l'insieme da aggiornare"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Fatto"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "È utile eseguire \"apt-get -f install\" per correggere ciò."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dipendenze non trovate. Riprovare usando -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "sconosciuto"
+
+#: apt-private/private-output.cc:265
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[installato, aggiornabile a: %s]"
+
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr "[installato, locale]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[installato, auto-rimovibile]"
+
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr "[installato, automatico]"
+
+#: apt-private/private-output.cc:274
+msgid "[installed]"
+msgstr "[installato]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[aggiornabile da: %s]"
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr "[configurazione residua]"
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "ma la versione %s è installata"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ma la versione %s sta per essere installata"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "ma non è installabile"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "ma è un pacchetto virtuale"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "ma non è installato"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "ma non sta per essere installato"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " oppure"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "I seguenti pacchetti NUOVI saranno installati:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "I seguenti pacchetti saranno RIMOSSI:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "I seguenti pacchetti saranno aggiornati:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "I seguenti pacchetti saranno RETROCESSI:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "I seguenti pacchetti bloccati saranno cambiati:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (a causa di %s) "
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ATTENZIONE: i seguenti pacchetti essenziali stanno per essere rimossi.\n"
+"Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
+"si sta facendo."
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aggiornati, %lu installati, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstallati, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu retrocessi, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu da rimuovere e %lu non aggiornati.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu non completamente installati o rimossi.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Errore di compilazione dell'espressione regolare - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Il comando update non accetta argomenti"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"%i pacchetto può essere aggiornato: eseguire \"apt list --upgradable\" per "
+"vederlo.\n"
+msgstr[1] ""
+"%i pacchetti possono essere aggiornati: eseguire \"apt list --upgradable\" "
+"per vederli.\n"
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr "Tutti i pacchetti sono aggiornati."
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "Ordinamento"
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "C'è %i record aggiuntivo: usare \"-a\" per visualizzarlo"
+msgstr[1] "Ci sono %i record aggiuntivi: usare \"-a\" per visualizzarli"
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "non un vero pacchetto (virtuale)"
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"Nota: questa è solo una simulazione.\n"
+" apt-get necessita dei privilegi di root per la normale esecuzione.\n"
+" Inoltre, il meccanismo di blocco non è attivato e non è quindi\n"
+" utile dare importanza a tutto ciò per una situazione reale."
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1479,249 +1712,6 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Il pacchetto \"%s\" non è installato e quindi non è stato rimosso\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "Elencazione"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] "C'è %i versione aggiuntiva: usare \"-a\" per visualizzarla"
-msgstr[1] "Ci sono %i versioni aggiuntive: usare \"-a\" per visualizzarle"
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Correzione delle dipendenze..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " non riuscita."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Impossibile correggere le dipendenze"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossibile minimizzare l'insieme da aggiornare"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Fatto"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "È utile eseguire \"apt-get -f install\" per correggere ciò."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dipendenze non trovate. Riprovare usando -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "sconosciuto"
-
-#: apt-private/private-output.cc:265
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[installato, aggiornabile a: %s]"
-
-#: apt-private/private-output.cc:268
-msgid "[installed,local]"
-msgstr "[installato, locale]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr "[installato, auto-rimovibile]"
-
-#: apt-private/private-output.cc:272
-msgid "[installed,automatic]"
-msgstr "[installato, automatico]"
-
-#: apt-private/private-output.cc:274
-msgid "[installed]"
-msgstr "[installato]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[aggiornabile da: %s]"
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr "[configurazione residua]"
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "ma la versione %s è installata"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ma la versione %s sta per essere installata"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "ma non è installabile"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "ma è un pacchetto virtuale"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "ma non è installato"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "ma non sta per essere installato"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " oppure"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "I seguenti pacchetti NUOVI saranno installati:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "I seguenti pacchetti saranno RIMOSSI:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "I seguenti pacchetti sono stati mantenuti alla versione attuale:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "I seguenti pacchetti saranno aggiornati:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "I seguenti pacchetti saranno RETROCESSI:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "I seguenti pacchetti bloccati saranno cambiati:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (a causa di %s) "
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ATTENZIONE: i seguenti pacchetti essenziali stanno per essere rimossi.\n"
-"Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa "
-"si sta facendo."
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aggiornati, %lu installati, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstallati, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu retrocessi, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu da rimuovere e %lu non aggiornati.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu non completamente installati o rimossi.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Errore di compilazione dell'espressione regolare - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Il comando update non accetta argomenti"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] "C'è %i record aggiuntivo: usare \"-a\" per visualizzarlo"
-msgstr[1] "Ci sono %i record aggiuntivi: usare \"-a\" per visualizzarli"
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "non un vero pacchetto (virtuale)"
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"Nota: questa è solo una simulazione.\n"
-" apt-get necessita dei privilegi di root per la normale esecuzione.\n"
-" Inoltre, il meccanismo di blocco non è attivato e non è quindi\n"
-" utile dare importanza a tutto ciò per una situazione reale."
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1775,34 +1765,36 @@ msgstr ""
msgid "Full Text Search"
msgstr "Ricerca sul testo"
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Trovato "
+#: apt-private/acqprogress.cc:62
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Trovato:%lu %s"
-#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Scaricamento di:"
+#: apt-private/acqprogress.cc:83
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Scaricamento di:%lu %s"
-# (ndt) questa non so cosa voglia dire
-#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#: apt-private/acqprogress.cc:113
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
-#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#: apt-private/acqprogress.cc:120
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
-#: apt-private/acqprogress.cc:150
+#: apt-private/acqprogress.cc:143
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
msgstr "Recuperati %sB in %s (%sB/s)\n"
-#: apt-private/acqprogress.cc:240
-#, c-format
+#: apt-private/acqprogress.cc:213
msgid " [Working]"
msgstr " [In lavorazione]"
-#: apt-private/acqprogress.cc:301
+#: apt-private/acqprogress.cc:281
#, c-format
msgid ""
"Media change: please insert the disc labeled\n"
@@ -1816,17 +1808,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Impossibile leggere %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1905,7 +1897,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Unione delle informazioni disponibili"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:228
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1929,46 +1921,46 @@ 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:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:258 apt-pkg/contrib/fileutl.cc:2092
#, c-format
msgid "Unable to mkstemp %s"
msgstr "Impossibile eseguire mkstemp %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:263 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Impossibile scrivere in %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:304
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Impossibile trovare la versione di debconf. È installato?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "L'elenco dell'estensione del pacchetto è troppo lungo"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Errore nell'elaborare la directory %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "L'elenco dell'estensione del sorgente è troppo lungo"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Errore nella scrittura dell'intestazione nel file \"contents\""
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Errore nell'elaborare i contenuti %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:624
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -2049,11 +2041,11 @@ msgstr ""
" -c=? Legge come configurazione il file specificato\n"
" -o=? Imposta un'opzione arbitraria di configurazione"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:820
msgid "No selections matched"
msgstr "Nessuna selezione corrisponde"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:905
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Mancano alcuni file nel file group di pacchetti \"%s\""
@@ -2088,9 +2080,8 @@ msgid "Failed to stat %s"
msgstr "Impossibile eseguire stat su %s"
#: ftparchive/cachedb.cc:326
-#, fuzzy
msgid "Failed to read .dsc"
-msgstr "Esecuzione di readlink su %s non riuscita"
+msgstr "Lettura di .dsc non riuscita"
#: ftparchive/cachedb.cc:359
msgid "Archive has no control record"
@@ -2168,22 +2159,22 @@ msgstr " Raggiunto il limite di DeLink di %sB.\n"
msgid "Archive had no package field"
msgstr "L'archivio non ha un campo \"package\""
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s non ha un campo override\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " il responsabile di %s è %s non %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s non ha un campo source override\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s non ha neppure un campo binario override\n"
@@ -2269,7 +2260,7 @@ msgstr "Problema nell'unlink di %s"
msgid "Failed to rename %s to %s"
msgstr "Rinomina di %s in %s non riuscita"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:50
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2293,11 +2284,11 @@ msgstr ""
" -c=? Legge come configurazione il file specificato\n"
" -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Record del pacchetto sconosciuto."
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:154
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2370,6 +2361,26 @@ msgstr "Impossibile trovare il record di autenticazione per %s"
msgid "Hash mismatch for: %s"
msgstr "Hash non corrispondente per %s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Impossibile trovare un driver per il metodo %s."
+
+#: apt-pkg/acquire-worker.cc:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "Il pacchetto %s è installato?"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Il metodo %s non si è avviato correttamente"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2384,175 +2395,312 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "Impossibile leggere l'elenco dei sorgenti."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Cache dei pacchetti vuota"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Il file della cache dei pacchetti è danneggiato"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "La versione del file della cache dei pacchetti è incompatibile"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr "Il file cache del pacchetto è danneggiato, è troppo piccolo"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Questo APT non supporta il sistema di versione \"%s\""
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr ""
"Il file della cache dei pacchetti è stato generato per un'altra architettura"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Dipende"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Pre-dipende"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Consiglia"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Raccomanda"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Va in conflitto"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Sostituisce"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Rende obsoleto"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Rompe"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Migliora"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "importante"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "richiesto"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "opzionale"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "extra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Calcolo dell'aggiornamento"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Impossibile trovare un driver per il metodo %s."
+msgid "Index file type '%s' is not supported"
+msgstr "Il file indice di tipo \"%s\" non è supportato"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, c-format
-msgid "Is the package %s installed?"
-msgstr "Il pacchetto %s è installato?"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "La stanza %u nel file delle sorgenti %s non è corretta (analisi URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Il metodo %s non si è avviato correttamente"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"La riga %lu nel file delle sorgenti %s non è corretta ([opzione] non "
+"analizzabile)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+"La riga %lu nel file delle sorgenti %s non è corretta ([opzione] troppo "
+"corta)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Il file indice di tipo \"%s\" non è supportato"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+"La riga %lu nel file delle sorgenti %s non è corretta ([%s] non è "
+"un'assegnazione)"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Generazione albero delle dipendenze"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+"La riga %lu nel file delle sorgenti %s non è corretta ([%s] non ha una "
+"chiave)"
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versioni candidate"
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"La riga %lu nel file delle sorgenti %s non è corretta ([%s] la chiave %s non "
+"ha un valore)"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generazione delle dipendenze"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "La riga %lu nel file %s non è corretta (URI)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Lettura informazioni sullo stato"
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "La riga %lu nel file %s non è corretta (dist)"
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Apertura del file di stato %s non riuscita"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "La riga %lu nel file %s non è corretta (URI parse)"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:217
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Scrittura del file temporaneo di stato %s non riuscita"
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "La riga %lu nel file %s non è corretta (absolute dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "La riga %lu nel file %s non è corretta (dist parse)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Apertura di %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Riga %u troppo lunga nel file %s."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "La riga %u nel file %s non è corretta (type)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file delle sorgenti %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+"Tipo \"%s\" non riconosciuto nella stanza %u nel file delle sorgenti %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr "La pulizia di %s non è supportata"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Impossibile eseguire stat su %s."
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "La cache ha un sistema di gestione delle versioni incompatibile"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Si è verificato un errore nell'elaborare %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"È stato superato il numero di nomi di pacchetti che questo APT può gestire."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "È stato superato il numero di versioni che questo APT può gestire."
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "È stato superato il numero di descrizioni che questo APT può gestire."
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "È stato superato il numero di dipendenze che questo APT può gestire."
+
+# (ndt) il primo è il nome del pacchetto, il secondo la versione
+#: apt-pkg/pkgcachegen.cc:591
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+"Il pacchetto %s v.%s non è stato trovato durante l'elaborazione delle "
+"dipendenze"
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Lettura elenco dei pacchetti"
+
+# (ndt) non mi convince per niente, ma vediamo cosa salta fuori
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Il file fornisce"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Errore di I/O nel salvare la cache sorgente"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Invia lo scenario al solver"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Invia la richiesta al solver"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Preparazione alla ricezione della soluzione"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "Il solver esterno è terminato senza un errore di messaggio"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "Esecuzione solver esterno"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "rename() non riuscita: %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Somma hash non corrispondente"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Le dimensioni non corrispondono"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
msgid "Invalid file format"
msgstr "Formato file non valido"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Errore di scrittura"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2562,7 +2710,7 @@ msgstr ""
"aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "Errore GPG: %s: %s"
@@ -2578,14 +2726,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2594,17 +2742,17 @@ msgstr ""
"Impossibile trovare la voce \"%s\" nel file Release (voce in sources.list "
"errata o file danneggiato)"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Impossibile trovare la somma hash per \"%s\" nel file Release"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2613,19 +2761,19 @@ msgstr ""
"Il file Release per %s è scaduto (non valido dal %s). Gli aggiornamenti per "
"questo repository non verranno applicati."
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2634,14 +2782,14 @@ msgstr ""
"Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
"sistemare manualmente questo pacchetto (a causa dell'architettura mancante)."
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
"Impossibile trovare una sorgente per scaricare la versione \"%s\" di \"%s\""
# (ndt) sarebbe da controllare se veramente possono esistere più file indice
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2649,119 +2797,44 @@ msgstr ""
"I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" "
"per il pacchetto %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "La cache ha un sistema di gestione delle versioni incompatibile"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Si è verificato un errore nell'elaborare %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"È stato superato il numero di nomi di pacchetti che questo APT può gestire."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "È stato superato il numero di versioni che questo APT può gestire."
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "È stato superato il numero di descrizioni che questo APT può gestire."
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "È stato superato il numero di dipendenze che questo APT può gestire."
-
-# (ndt) il primo è il nome del pacchetto, il secondo la versione
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-"Il pacchetto %s v.%s non è stato trovato durante l'elaborazione delle "
-"dipendenze"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Lettura elenco dei pacchetti"
-
-# (ndt) non mi convince per niente, ma vediamo cosa salta fuori
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Il file fornisce"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Errore di I/O nel salvare la cache sorgente"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Il blocco vendor %s non contiene impronte"
# (ndt) sarebbe da controllare meglio assieme a quella dopo
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Manca la directory di liste %spartial."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Manca la directory di archivio %spartial."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Il file indice di tipo \"%s\" non è supportato"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "Impossibile bloccare la directory %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Scaricamento file %li di %li (%s rimanente)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Scaricamento file %li di %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Impossibile scaricare alcuni file di indice: saranno ignorati o verranno "
-"usati quelli vecchi."
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
"È necessario inserire alcuni URI di tipo \"source\" nel file sources.list"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Impossibile eseguire stat su %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2787,7 +2860,7 @@ msgstr "Impossibile comprendere il tipo di gancio %s"
msgid "No priority (or zero) specified for pin"
msgstr "Priorità per il gancio non specificata (o zero)"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2797,12 +2870,12 @@ msgstr ""
"maggiori informazioni, consultare \"man 5 apt.conf\" alla sezione \"APT::"
"Immediate-Configure\" (%d)."
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr "Impossibile configurare \"%s\". "
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2814,10 +2887,13 @@ msgstr ""
"situazione critica, ma se si vuole realmente procedere, attivare l'opzione "
"APT::Force-LoopBreak."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Riga %u troppo lunga nel file %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Impossibile scaricare alcuni file di indice: saranno ignorati o verranno "
+"usati quelli vecchi."
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2888,11 +2964,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Copia elenco pacchetti..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Scrittura nuovo elenco sorgenti\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n"
@@ -2904,7 +2980,7 @@ msgstr ""
"Il pacchetto %s deve essere reinstallato, ma non è possibile trovarne un "
"archivio."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2912,151 +2988,41 @@ msgstr ""
"Errore, pkgProblemResolver::Resolve ha generato delle interruzioni. Questo "
"potrebbe essere causato da pacchetti bloccati."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "Invia lo scenario al solver"
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr "Invia la richiesta al solver"
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr "Preparazione alla ricezione della soluzione"
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr "Il solver esterno è terminato senza un errore di messaggio"
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr "Esecuzione solver esterno"
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Impossibile analizzare il file di pacchetto %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Impossibile analizzare il file di pacchetto %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Impossibile analizzare il file Release %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Nessuna sezione nel file Release %s"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Nessuna voce Hash nel file Release %s"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Voce \"Valid-Until\" nel file Release %s non valida"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Voce \"Date\" nel file Release %s non valida"
-
-#: apt-pkg/sourcelist.cc:127
-#, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "La stanza %u nel file delle sorgenti %s non è corretta (analisi URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"La riga %lu nel file delle sorgenti %s non è corretta ([opzione] non "
-"analizzabile)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"La riga %lu nel file delle sorgenti %s non è corretta ([opzione] troppo "
-"corta)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"La riga %lu nel file delle sorgenti %s non è corretta ([%s] non è "
-"un'assegnazione)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"La riga %lu nel file delle sorgenti %s non è corretta ([%s] non ha una "
-"chiave)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"La riga %lu nel file delle sorgenti %s non è corretta ([%s] la chiave %s non "
-"ha un valore)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "La riga %lu nel file %s non è corretta (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "La riga %lu nel file %s non è corretta (dist)"
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "La riga %lu nel file %s non è corretta (URI parse)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Generazione albero delle dipendenze"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "La riga %lu nel file %s non è corretta (absolute dist)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versioni candidate"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "La riga %lu nel file %s non è corretta (dist parse)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generazione delle dipendenze"
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Apertura di %s"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lettura informazioni sullo stato"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "La riga %u nel file %s non è corretta (type)"
+msgid "Failed to open StateFile %s"
+msgstr "Apertura del file di stato %s non riuscita"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file delle sorgenti %s"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Scrittura del file temporaneo di stato %s non riuscita"
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr ""
-"Tipo \"%s\" non riconosciuto nella stanza %u nel file delle sorgenti %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Impossibile analizzare il file di pacchetto %s (%d)"
# (ndt) dovrebbe essere inteso il file Release
#: apt-pkg/cacheset.cc:501
@@ -3070,50 +3036,50 @@ msgstr "Release \"%s\" per \"%s\" non trovato."
msgid "Version '%s' for '%s' was not found"
msgstr "Version \"%s\" per \"%s\" non trovato"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Impossibile trovare il task \"%s\""
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr ""
"Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Impossibile trovare alcun pacchetto tramite il glob \"%s\""
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Impossibile selezionare le versioni dal pacchetto \"%s\" poiché è virtuale"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Impossibile selezionare la versione più recente dal pacchetto \"%s\" poiché "
"è virtuale"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Impossibile selezionare la versione candidata dal pacchetto %s poiché non ha "
"alcun candidato"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Impossibile selezionare la versione installata dal pacchetto %s poiché non è "
"installato"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3122,184 +3088,59 @@ msgstr ""
"Impossibile selezionare la versione installata o la candidata dal pacchetto "
"\"%s\" poiché non sono presenti"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Installazione di %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Configurazione di %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Rimozione di %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "Rimozione completa di %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Notata la sparizione di %s"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Esecuzione comando di post installazione %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Directory \"%s\" mancante"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Impossibile aprire il file \"%s\""
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Preparazione di %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "Estrazione di %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Preparing to configure %s"
-msgstr "Preparazione alla configurazione di %s"
+msgid "Unable to parse Release file %s"
+msgstr "Impossibile analizzare il file Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Installed %s"
-msgstr "Pacchetto %s installato"
+msgid "No sections in Release file %s"
+msgstr "Nessuna sezione nel file Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Preparazione alla rimozione di %s"
+msgid "No Hash entry in Release file %s"
+msgstr "Nessuna voce Hash nel file Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Removed %s"
-msgstr "Pacchetto %s rimosso"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Voce \"Valid-Until\" nel file Release %s non valida"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Preparazione alla rimozione completa di %s"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Voce \"Date\" nel file Release %s non valida"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420
#, c-format
-msgid "Completely removed %s"
-msgstr "Pacchetto %s rimosso completamente"
+msgid "%lid %lih %limin %lis"
+msgstr "%lig %lih %limin %lis"
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Can not write log (%s)"
-msgstr "Impossibile scrivere il registro (%s)"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr "È /dev/pts montato?"
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr "stdout è un terminale?"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr "L'operazione è stata interrotta prima di essere completata"
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-"Segnalazione apport non scritta poiché è stato raggiunto il valore massimo "
-"di MaxReports"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "Problemi con le dipendenze - Viene lasciato non configurato"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Segnalazione apport non scritta poiché il messaggio di errore indica la "
-"presenza di un fallimento precedente."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Segnalazione apport non scritta poiché il messaggio di errore indica un "
-"errore per disco pieno."
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Segnalazione apport non scritta poiché il messaggio di errore indica un "
-"errore di memoria esaurita."
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Segnalazione apport non scritta poiché il messaggio di errore indica un "
-"errore nel sistema locale."
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Segnalazione apport non scritta poiché il messaggio di errore indica un "
-"errore di I/O di dpkg."
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
-#: apt-pkg/deb/debsystem.cc:91
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Impossibile acquisire il blocco sulla directory di amministrazione (%s). Un "
-"altro processo potrebbe tenerla occupata."
+msgid "%limin %lis"
+msgstr "%limin %lis"
-#: apt-pkg/deb/debsystem.cc:94
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Impossibile acquisire il blocco sulla directory di amministrazione (%s). È "
-"necessario essere root."
+msgid "%lis"
+msgstr "%lis"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1279
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"dpkg è stato interrotto. È necessario eseguire \"%s\" per correggere il "
-"problema. "
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Non bloccato"
+msgid "Selection %s not found"
+msgstr "Selezione %s non trovata"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3440,35 +3281,6 @@ msgstr "..."
msgid "%c%s... %u%%"
msgstr "%c%s... %u%%"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lig %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Selezione %s non trovata"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Impossibile eseguire mmap su un file vuoto"
@@ -3531,118 +3343,292 @@ msgstr ""
msgid "Unable to stat the mount point %s"
msgstr "Impossibile eseguire stat sul punto di mount %s"
-#: apt-pkg/contrib/cdromutl.cc:246
+#: apt-pkg/contrib/cdromutl.cc:247
msgid "Failed to stat the cdrom"
msgstr "Esecuzione di stat sul CD-ROM non riuscita"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Tipo di abbreviazione non riconosciuto: \"%c\""
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Apertura file di configurazione %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, 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:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Errore di sintassi %s:%u: tag non corretto"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Errore di sintassi %s:%u: caratteri extra dopo il valore"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Errore di sintassi %s:%u: troppe inclusioni annidate"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Errore di sintassi %s:%u: incluso da qui"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Errore di sintassi %s:%u: direttiva \"%s\" non supportata"
# (ndt) sarebbe da controllare meglio...
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Errore di sintassi %s:%u: la direttiva clear richiede un albero di opzioni "
"come argomento"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, 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/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Opzione a riga di comando \"%c\" [da %s] sconosciuta."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Opzione a riga di comando %s non comprensibile"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Opzione a riga di comando %s non booleana"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "L'opzione %s richiede un argomento."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
"Opzione %s: la specifica di configurazione dell'oggetto deve avere un "
"=<valore>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, 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:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Opzione \"%s\" troppo lunga"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "Il valore %s non è comprensibile, provare \"true\" o \"false\"."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Operazione %s non valida"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Installazione di %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Configurazione di %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Rimozione di %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "Rimozione completa di %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Notata la sparizione di %s"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Esecuzione comando di post installazione %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Directory \"%s\" mancante"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Impossibile aprire il file \"%s\""
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Preparazione di %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Estrazione di %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Preparazione alla configurazione di %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "Pacchetto %s installato"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Preparazione alla rimozione di %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "Pacchetto %s rimosso"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Preparazione alla rimozione completa di %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "Pacchetto %s rimosso completamente"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, c-format
+msgid "Can not write log (%s)"
+msgstr "Impossibile scrivere il registro (%s)"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr "È /dev/pts montato?"
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "L'operazione è stata interrotta prima di essere completata"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+"Segnalazione apport non scritta poiché è stato raggiunto il valore massimo "
+"di MaxReports"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "Problemi con le dipendenze - Viene lasciato non configurato"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Segnalazione apport non scritta poiché il messaggio di errore indica la "
+"presenza di un fallimento precedente."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Segnalazione apport non scritta poiché il messaggio di errore indica un "
+"errore per disco pieno."
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Segnalazione apport non scritta poiché il messaggio di errore indica un "
+"errore di memoria esaurita."
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Segnalazione apport non scritta poiché il messaggio di errore indica un "
+"errore nel sistema locale."
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Segnalazione apport non scritta poiché il messaggio di errore indica un "
+"errore di I/O di dpkg."
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Impossibile acquisire il blocco sulla directory di amministrazione (%s). Un "
+"altro processo potrebbe tenerla occupata."
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+"Impossibile acquisire il blocco sulla directory di amministrazione (%s). È "
+"necessario essere root."
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"dpkg è stato interrotto. È necessario eseguire \"%s\" per correggere il "
+"problema. "
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Non bloccato"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "DropNode invocata su un nodo ancora collegato"
@@ -3748,7 +3734,7 @@ msgstr "Questo non è un archivio DEB valido: membro \"%s\" mancante"
msgid "Internal error, could not locate member %s"
msgstr "Errore interno, impossibile trovare il membro %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "File \"control\" non analizzabile"
@@ -3777,23 +3763,23 @@ msgstr "L'archivio è troppo piccolo"
msgid "Failed to read the archive headers"
msgstr "Lettura delle intestazioni dell'archivio non riuscita"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Creazione delle pipe non riuscita"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Esecuzione di gzip non riuscita "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Archivio danneggiato"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Checksum di tar non riuscito, archivio danneggiato"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Intestazione TAR di tipo %u sconosciuta, member %s"
@@ -3801,15 +3787,24 @@ msgstr "Intestazione TAR di tipo %u sconosciuta, member %s"
#~ msgid "Total dependency version space: "
#~ msgstr "Totale spazio dipendenza di versione: "
+#~ msgid "%s %s for %s compiled on %s %s\n"
+#~ msgstr "%s %s per %s compilato il %s %s\n"
+
#~ msgid "You don't have enough free space in %s"
#~ msgstr "Lo spazio libero in %s è insufficiente"
#~ msgid "Done"
#~ msgstr "Eseguito"
+#~ msgid "Unable to parse package file %s (2)"
+#~ msgstr "Impossibile analizzare il file di pacchetto %s (2)"
+
#~ msgid "No keyring installed in %s."
#~ msgstr "Nessun portachiavi installato in %s."
+#~ msgid "Is stdout a terminal?"
+#~ msgstr "stdout è un terminale?"
+
#~ msgid "ioctl(TIOCGWINSZ) failed"
#~ msgstr "ioctl(TIOCGWINSZ) non riuscita"
diff --git a/po/ja.po b/po/ja.po
index 774d842af..f8f55f8aa 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,10 +6,10 @@
# Debian Project, Kenshi Muto <kmuto@debian.org>, 2004-2012
msgid ""
msgstr ""
-"Project-Id-Version: apt 1.0.9.1\n"
+"Project-Id-Version: apt 1.0.9.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
-"PO-Revision-Date: 2014-09-27 19:32+0900\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
+"PO-Revision-Date: 2014-12-12 22:33+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
"Language: ja\n"
@@ -23,145 +23,145 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "パッケージ %s のバージョン %s には解決不可能な依存関係があります:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "パッケージ名総数: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "パッケージ構造総数: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " 通常パッケージ: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " 純粋仮想パッケージ: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " 単一仮想パッケージ: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " 複合仮想パッケージ: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " 欠落: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "個別バージョン総数: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "個別説明総数: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "依存関係総数: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "バージョン/ファイル関係総数: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "説明/ファイル関係総数: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "提供マッピング総数: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Glob 文字列の総数: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "総空き容量: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "総占有容量: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Package ファイル %s が同期していません。"
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "パッケージが見つかりません"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "検索パターンはちょうど 1 つだけ指定してください"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
"このコマンドは時代遅れです。'apt-mark showauto' を代わりに使用してください。"
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "パッケージ %s が見つかりません"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "パッケージファイル:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "キャッシュが同期しておらず、パッケージファイルを相互参照できません"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Pin されたパッケージ:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(見つかりません)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " インストールされているバージョン: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " 候補: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(なし)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " パッケージ Pin: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " バージョンテーブル:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s コンパイル日時: %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -231,20 +231,20 @@ msgstr ""
" -o=? 指定した設定オプションを読み込む (例: -o dir::cache=/tmp)\n"
"詳細は、apt-cache(8) や apt.conf(5) のマニュアルページを参照してください。\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "このディスクに、'Debian 5.0.3 Disk 1' のような名前を付けてください"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "ディスクをドライブに入れて Enter キーを押してください"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "'%s' を '%s' にマウントできませんでした"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -258,7 +258,7 @@ msgstr ""
"CD-ROM の自動検出およびマウントポイントの詳細については、'man apt-cdrom' を参"
"照してください。"
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
"あなたの持っている CD セットの残り全部に、この手順を繰り返してください。"
@@ -295,48 +295,48 @@ msgstr ""
" -c=? 指定した設定ファイルを読み込む\n"
" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "アーキテクチャ '%s' 用のパッケージは見つかりませんでした"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "パッケージ '%s' のバージョン '%s' は見つかりませんでした"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "リリース '%2$s' にはパッケージ '%1$s' は見つかりませんでした"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "'%2$s' の代わりに '%1$s' をソースパッケージとして選出しています\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "パッケージ '%2$s' のバージョン '%1$s' は見つかりませんでした"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "パッケージ %s が見つかりません"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s は手動でインストールしたと設定されました。\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s は自動でインストールしたと設定されました。\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -344,30 +344,25 @@ msgstr ""
"このコマンドは時代遅れです。'apt-mark auto' および 'apt-mark manual' を代わり"
"に使用してください。"
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "内部エラー、問題リゾルバが何かを破壊しました"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "ディレクトリ %s をロックできません"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "ダウンロードディレクトリをロックできません"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr ""
"ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s のソースパッケージが見つかりません"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -377,7 +372,7 @@ msgstr ""
"ます:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -389,69 +384,69 @@ msgstr ""
"bzr branch %s\n"
"を使用してください。\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB のソースアーカイブを取得する必要があります。\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "ソース %s を取得\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "いくつかのアーカイブの取得に失敗しました。"
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "展開コマンド '%s' が失敗しました。\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
"'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "ビルドコマンド '%s' が失敗しました。\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "子プロセスが失敗しました"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -460,27 +455,27 @@ msgstr ""
"%s に利用可能なアーキテクチャ情報がありません。セットアップのために apt."
"conf(5) の APT::Architectures を参照してください。"
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "ビルド依存関係の処理に失敗しました"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s のビルド依存情報を取得できません"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s にはビルド依存情報が指定されていません。\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -489,7 +484,7 @@ msgstr ""
"パッケージ %3$s が '%4$s' パッケージで許されていないため、%2$s に対する %1$s "
"の依存関係を満たすことができません"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -498,14 +493,14 @@ msgstr ""
"パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
"ができません"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, 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:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -514,7 +509,7 @@ msgstr ""
"パッケージ %3$s の候補バージョンはバージョンについての要求を満たせないた"
"め、%2$s に対する %1$s の依存関係を満たすことができません"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -523,17 +518,17 @@ msgstr ""
"パッケージ %3$s の候補バージョンが存在しないため、%2$s に対する %1$s の依存関"
"係を満たすことができません"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s のビルド依存関係を満たすことができませんでした。"
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "ビルド依存関係の処理に失敗しました"
@@ -646,11 +641,11 @@ msgstr "引数として URL が 1 つ必要です"
msgid "Must specify at least one pair url/filename"
msgstr "少なくとも URL / ファイル名を 1 組指定する必要があります"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr "ダウンロード失敗"
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -674,52 +669,53 @@ msgstr ""
"\n"
" この APT helper は Super Meep Powers 化されています。\n"
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "%s をインストールされていないものとしてマークできません\n"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s は手動でインストールしたとすでに設定されています。\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s は自動でインストールしたとすでに設定されています。\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr "%s はすでに保留に設定されています。\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr "%s はすでに保留されていません。\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s を待ちましたが、そこにはありませんでした"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr "%s は保留に設定されました。\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "%s の保留を解除しました。\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr "dpkg の実行に失敗しました。root 権限で実行していますか?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -984,7 +980,7 @@ msgstr "データソケット接続タイムアウト"
msgid "Unable to accept connection"
msgstr "接続を accept できません"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "ファイルのハッシュでの問題"
@@ -1073,23 +1069,23 @@ msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました"
msgid "Unable to connect to %s:%s:"
msgstr "%s:%s へ接続できません:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "少なくとも 1 つの不正な署名が発見されました。"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"署名を検証するための 'apt-key' の実行ができませんでした (gnupg はインストール"
"されていますか?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1098,15 +1094,15 @@ msgstr ""
"クリアサインされたファイルが有効ではなく、'%s' を得ました (認証にネットワーク"
"が必要?)"
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "apt-key の実行中に未知のエラーが発生"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "以下の署名が無効です:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1116,31 +1112,31 @@ msgstr "公開鍵を利用できないため、以下の署名は検証できま
msgid "Empty files can't be valid archives"
msgstr "空のファイルは有効なアーカイブと認められません"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "サーバからの読み込みに失敗しました"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "ファイルへの書き込みでエラーが発生しました"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "select に失敗しました"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "接続タイムアウト"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "出力ファイルへの書き込みでエラーが発生しました"
@@ -1148,53 +1144,298 @@ msgstr "出力ファイルへの書き込みでエラーが発生しました"
msgid "Waiting for headers"
msgstr "ヘッダの待機中です"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "不正なヘッダ行です"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP サーバが不正なリプライヘッダを送信してきました"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP サーバが不正な Content-Length ヘッダを送信してきました"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP サーバが不正な Content-Range ヘッダを送信してきました"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "HTTP サーバのレンジサポートが壊れています"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "不明な日付フォーマットです"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "不正なヘッダです"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "接続失敗"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "内部エラー"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "一覧表示"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+"追加バージョンが %i 件あります。表示するには '-a' スイッチを付けてください。"
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "依存関係を解決しています ..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " 失敗しました。"
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "依存関係を訂正できません"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "アップグレードセットを最小化できません"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " 完了"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
+"ん。"
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "未解決の依存関係があります。-f オプションを試してください。"
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "不明"
+
+#: apt-private/private-output.cc:265
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[インストール済み、%s にアップグレード可]"
+
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr "[インストール済み、ローカル]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[インストール済み、自動削除可]"
+
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr "[インストール済み、自動]"
+
+#: apt-private/private-output.cc:274
+msgid "[installed]"
+msgstr "[インストール済み]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[%s からアップグレード可]"
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr "[設定が残存]"
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "しかし、%s はインストールされています"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "しかし、%s はインストールされようとしています"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "しかし、インストールすることができません"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "しかし、これは仮想パッケージです"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "しかし、インストールされていません"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "しかし、インストールされようとしていません"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " または"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "以下のパッケージには満たせない依存関係があります:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "以下のパッケージが新たにインストールされます:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "以下のパッケージは「削除」されます:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "以下のパッケージは保留されます:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "以下のパッケージはアップグレードされます:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "以下のパッケージは「ダウングレード」されます:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "以下の変更禁止パッケージは変更されます:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (%s のため) "
+
+#: apt-private/private-output.cc:696
+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"
+"何をしようとしているか本当にわかっていない場合は、実行してはいけません!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "再インストール: %lu 個、"
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "ダウングレード: %lu 個、"
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "削除: %lu 個、保留: %lu 個。\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "正規表現の展開エラー - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "update コマンドは引数をとりません"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"アップグレードできるパッケージが %i 個あります。表示するには 'apt list --"
+"upgradable' を実行してください。\n"
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr "パッケージはすべて最新です。"
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "ソート中"
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+"追加レコードが %i 件あります。表示するには '-a' スイッチを付けてください。"
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "実際のパッケージではありません (仮想)"
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"注意: これはシミュレーションにすぎません!\n"
+" apt-get は実際の実行に root 権限を必要とします。\n"
+" ロックが非アクティブであることから、今この時点の状態に妥当性が\n"
+" あるとは言い切れないことに注意してください!"
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "内部エラー、InstallPackages が壊れたパッケージで呼び出されました!"
@@ -1398,7 +1639,7 @@ msgstr "壊れたパッケージ"
#: apt-private/private-install.cc:710
msgid "The following extra packages will be installed:"
-msgstr "以下の特別パッケージがインストールされます:"
+msgstr "以下の追加パッケージがインストールされます:"
#: apt-private/private-install.cc:800
msgid "Suggested packages:"
@@ -1455,251 +1696,6 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr "パッケージ '%s' はインストールされていないため、削除もされません\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "一覧表示"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-"追加バージョンが %i 件あります。表示するには '-a' スイッチを付けてください。"
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "依存関係を解決しています ..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " 失敗しました。"
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "依存関係を訂正できません"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "アップグレードセットを最小化できません"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " 完了"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
-"ん。"
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "未解決の依存関係があります。-f オプションを試してください。"
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "不明"
-
-#: apt-private/private-output.cc:265
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[インストール済み、%s にアップグレード可]"
-
-#: apt-private/private-output.cc:268
-msgid "[installed,local]"
-msgstr "[インストール済み、ローカル]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr "[インストール済み、自動削除可]"
-
-#: apt-private/private-output.cc:272
-msgid "[installed,automatic]"
-msgstr "[インストール済み、自動]"
-
-#: apt-private/private-output.cc:274
-msgid "[installed]"
-msgstr "[インストール済み]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[%s からアップグレード可]"
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr "[設定未完了]"
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "しかし、%s はインストールされています"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "しかし、%s はインストールされようとしています"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "しかし、インストールすることができません"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "しかし、これは仮想パッケージです"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "しかし、インストールされていません"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "しかし、インストールされようとしていません"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " または"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "以下のパッケージには満たせない依存関係があります:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "以下のパッケージが新たにインストールされます:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "以下のパッケージは「削除」されます:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "以下のパッケージは保留されます:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "以下のパッケージはアップグレードされます:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "以下のパッケージは「ダウングレード」されます:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "以下の変更禁止パッケージは変更されます:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (%s のため) "
-
-#: apt-private/private-output.cc:696
-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"
-"何をしようとしているか本当にわかっていない場合は、実行してはいけません!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "再インストール: %lu 個、"
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "ダウングレード: %lu 個、"
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "削除: %lu 個、保留: %lu 個。\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[y/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "正規表現の展開エラー - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "update コマンドは引数をとりません"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"アップグレードできるパッケージが %i 個あります。表示するには 'apt list --"
-"upgradable' を実行してください。\n"
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr "パッケージはすべて最新です。"
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-"追加レコードが %i 件あります。表示するには '-a' スイッチを付けてください。"
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "実際のパッケージではありません (仮想)"
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"注意: これはシミュレーションにすぎません!\n"
-" apt-get は実際の実行に root 権限を必要とします。\n"
-" ロックが非アクティブであることから、今この時点の状態に妥当性が\n"
-" あるとは言い切れないことに注意してください!"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1754,20 +1750,24 @@ msgid "Full Text Search"
msgstr "全文検索"
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "ヒット "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "ヒット:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "取得:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "取得:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "無視 "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "無視:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "エラー "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "エラー:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1793,17 +1793,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "%s を読み込むことができません"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1875,7 +1875,7 @@ msgstr "が重要です。これを修正して「導入」を再度実行して
msgid "Merging available information"
msgstr "入手可能情報をマージしています"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1899,47 +1899,47 @@ msgstr ""
" -c=? 指定した設定ファイルを読み込む\n"
" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, c-format
msgid "Unable to mkstemp %s"
msgstr "mkstemp %s を実行できません"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "%s に書き込めません"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
"debconf のバージョンを取得できません。debconf はインストールされていますか?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "パッケージ拡張子リストが長すぎます"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "ディレクトリ %s の処理中にエラーが発生しました"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "ソース拡張子リストが長すぎます"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Contents ファイルへのヘッダの書き込み中にエラーが発生しました"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Contents %s の処理中にエラーが発生しました"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -2020,11 +2020,11 @@ msgstr ""
" -c=? 指定の設定ファイルを読む\n"
" -o=? 任意の設定オプションを設定する"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "選択にマッチするものがありません"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "パッケージファイルグループ `%s' に見当たらないファイルがあります"
@@ -2135,22 +2135,22 @@ msgstr " リンクを外す制限の %sB に到達しました。\n"
msgid "Archive had no package field"
msgstr "アーカイブにパッケージフィールドがありませんでした"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s に override エントリがありません\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %1$s メンテナは %3$s ではなく %2$s です\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s にソース override エントリがありません\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s にバイナリ override エントリがありません\n"
@@ -2236,7 +2236,7 @@ msgstr "%s のリンク解除で問題が発生しました"
msgid "Failed to rename %s to %s"
msgstr "%s を %s に名前変更できませんでした"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2260,11 +2260,11 @@ msgstr ""
" -c=? 指定した設定ファイルを読み込む\n"
" -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "不明なパッケージレコードです!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2338,6 +2338,28 @@ msgstr "認証レコードが見つかりません: %s"
msgid "Hash mismatch for: %s"
msgstr "ハッシュサムが適合しません: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "メソッドドライバ %s が見つかりません。"
+
+#: apt-pkg/acquire-worker.cc:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "パッケージ %s はインストールされていますか?"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "メソッド %s が正常に開始しませんでした"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"'%s' とラベルの付いたディスクをドライブ '%s' に入れて Enter キーを押してくだ"
+"さい。"
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2354,177 +2376,299 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "ソースのリストを読むことができません。"
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "空のパッケージキャッシュ"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "パッケージキャッシュファイルが壊れています"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "このパッケージキャッシュファイルは互換性がないバージョンです"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr "パッケージキャッシュファイルが壊れています。短かすぎます"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "この APT はバージョニングシステム '%s' をサポートしていません"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "パッケージキャッシュが異なるアーキテクチャ用に構築されています"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "依存"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "先行依存"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "提案"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "推奨"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "競合"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "置換"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "廃止"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "破壊"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "拡張"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "重要"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "要求"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "標準"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "任意"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "特別"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
-#, fuzzy
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
-msgstr "アップグレードパッケージを検出しています ... "
+msgstr "アップグレードパッケージを検出しています"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "メソッドドライバ %s が見つかりません。"
+msgid "Index file type '%s' is not supported"
+msgstr "インデックスファイルのタイプ '%s' はサポートされていません"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, c-format
-msgid "Is the package %s installed?"
-msgstr "パッケージ %s はインストールされていますか?"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "ソースリスト %2$s の %1$u 個目の区切りが不正です (URI parse)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "メソッド %s が正常に開始しませんでした"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] を解釈できません)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-"'%s' とラベルの付いたディスクをドライブ '%s' に入れて Enter キーを押してくだ"
-"さい。"
+"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] が短かすぎます)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "インデックスファイルのタイプ '%s' はサポートされていません"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+"ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] は割り当てられていません)"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "依存関係ツリーを作成しています"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s にキーがありません)"
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "候補バージョン"
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] キー %4$s に値がありません)"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "依存関係の生成"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "状態情報を読み取っています"
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)"
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "状態ファイル %s のオープンに失敗しました"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:217
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "一時状態ファイル %s の書き込みに失敗しました"
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s をオープンしています"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
+
+#: apt-pkg/sourcelist.cc:375
+#, 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:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "ソースリスト %3$s の %2$u 個目の節 '%1$s' は不明です"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr "%s の消去はサポートされていません"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s の状態を取得できません。"
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "キャッシュに非互換なバージョニングシステムがあります"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s を処理中にエラーが発生しました (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "この APT が対応している以上の数のパッケージが指定されました。"
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "この APT が対応している以上の数のバージョンが要求されました。"
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "この APT が対応している以上の数の説明が要求されました。"
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "この APT が対応している以上の数の依存関係が発生しました。"
+
+#: apt-pkg/pkgcachegen.cc:591
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした"
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "ソースパッケージリスト %s の状態を取得できません"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "パッケージリストを読み込んでいます"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "ファイル提供情報を収集しています"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "ソルバにシナリオを送信"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "ソルバにリクエストを送信"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "解決を受け取る準備"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "外部ソルバを実行"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "名前の変更に失敗しました。%s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "ハッシュサムが適合しません"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "サイズが適合しません"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
msgid "Invalid file format"
msgstr "不正なファイル形式"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "書き込みエラー"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2534,7 +2678,7 @@ msgstr ""
"ファイルが使われます。GPG エラー: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG エラー: %s: %s"
@@ -2550,14 +2694,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2566,16 +2710,16 @@ msgstr ""
"期待されるエントリ '%s' が Release ファイル内に見つかりません (誤った "
"sources.list エントリか、壊れたファイル)"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Release ファイル中の '%s' のハッシュサムを見つけられません"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2584,21 +2728,21 @@ msgstr ""
"%s の Release ファイルは期限切れ (%s 以来無効) です。このリポジトリからの更新"
"物は適用されません。"
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
"ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し"
"ました)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2607,12 +2751,12 @@ msgstr ""
"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
"で修正する必要があります (存在しないアーキテクチャのため)。"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "'%2$s' のバージョン '%1$s' をダウンロードするソースが見つかりません"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2620,112 +2764,42 @@ msgstr ""
"パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
"フィールドがありません。"
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "キャッシュに非互換なバージョニングシステムがあります"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s を処理中にエラーが発生しました (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "この APT が対応している以上の数のパッケージが指定されました。"
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "この APT が対応している以上の数のバージョンが要求されました。"
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "この APT が対応している以上の数の説明が要求されました。"
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "この APT が対応している以上の数の依存関係が発生しました。"
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "ソースパッケージリスト %s の状態を取得できません"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "パッケージリストを読み込んでいます"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "ファイル提供情報を収集しています"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "ベンダブロック %s は鍵指紋を含んでいません"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "リストディレクトリ %spartial が見つかりません。"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "アーカイブディレクトリ %spartial が見つかりません。"
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, c-format
-msgid "Clean of %s is not supported"
-msgstr "%s の消去はサポートされていません"
+msgid "Unable to lock directory %s"
+msgstr "ディレクトリ %s をロックできません"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "ファイルを取得しています %li/%li (残り %s)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "ファイルを取得しています %li/%li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され"
-"るか、古いものが代わりに使われます。"
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "sources.list に 'ソース' URI を指定する必要があります"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s の状態を取得できません。"
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2751,7 +2825,7 @@ msgstr "pin タイプ %s を理解できませんでした"
msgid "No priority (or zero) specified for pin"
msgstr "pin で優先度 (または 0) が指定されていません"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2760,12 +2834,12 @@ msgstr ""
"'%s' の即時設定は動作しません。詳細については man 5 apt.conf の APT::"
"Immediate-Configure の項を参照してください。(%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr "'%s' を設定できませんでした。"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2776,10 +2850,13 @@ msgstr ""
"ケージ %s を削除します。これは多くの場合に問題が起こる原因となります。本当に"
"これを行いたいなら、APT::Force-LoopBreak オプションを有効にしてください。"
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。"
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"いくつかのインデックスファイルのダウンロードに失敗しました。これらは無視され"
+"るか、古いものが代わりに使われます。"
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2850,11 +2927,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "パッケージリストをコピーしています ..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "新しいソースリストを書き込んでいます\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "このディスクのソースリストのエントリ:\n"
@@ -2866,7 +2943,7 @@ msgstr ""
"パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見"
"つけることができませんでした。"
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2874,143 +2951,40 @@ msgstr ""
"エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー"
"ジが原因です。"
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。"
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "ソルバにシナリオを送信"
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr "ソルバにリクエストを送信"
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr "解決を受け取る準備"
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr "外部ソルバが適切なエラーメッセージなしに失敗しました"
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr "外部ソルバを実行"
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "パッケージファイル %s を解釈することができません (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "パッケージファイル %s を解釈することができません (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Release ファイル %s を解釈することができません"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Release ファイル %s にセクションがありません"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Release ファイル %s に Hash エントリがありません"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Release ファイル %s に無効な 'Valid-Until' エントリがあります"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Release ファイル %s に無効な 'Date' エントリがあります"
-
-#: apt-pkg/sourcelist.cc:127
-#, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "ソースリスト %2$s の %1$u 個目の区切りが不正です (URI parse)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] を解釈できません)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"ソースリスト %2$s の %1$lu 行目が不正です ([オプション] が短かすぎます)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] は割り当てられていません)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "ソースリスト %2$s の %1$lu 行目が不正です ([%3$s にキーがありません)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"ソースリスト %2$s の %1$lu 行目が不正です ([%3$s] キー %4$s に値がありません)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)"
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "依存関係ツリーを作成しています"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候補バージョン"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "依存関係の生成"
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "%s をオープンしています"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "状態情報を読み取っています"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
+msgid "Failed to open StateFile %s"
+msgstr "状態ファイル %s のオープンに失敗しました"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です"
+msgid "Failed to write temporary StateFile %s"
+msgstr "一時状態ファイル %s の書き込みに失敗しました"
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "ソースリスト %3$s の %2$u 個目の節 '%1$s' は不明です"
+msgid "Unable to parse package file %s (%d)"
+msgstr "パッケージファイル %s を解釈することができません (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -3022,45 +2996,45 @@ msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした"
msgid "Version '%s' for '%s' was not found"
msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "タスク '%s' が見つかりません"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "正規表現 '%s' ではパッケージは見つかりませんでした"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "'%s' に一致するパッケージは見つかりませんでした"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "純粋な仮想パッケージのため、パッケージ '%s' のバージョンを選べません"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"純粋な仮想パッケージのため、パッケージ '%s' の最新バージョンを選べません"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "候補が存在しないので、パッケージ %s の候補バージョンを選べません"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"インストールされていないので、パッケージ %s のインストール済みバージョンを選"
"べません。"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3069,181 +3043,59 @@ msgstr ""
"パッケージ '%s' のインストール済みまたは候補のバージョンはいずれも存在しない"
"ので選べません"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "%s をインストールしています"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "%s を設定しています"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "%s を削除しています"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "%s を完全に削除しています"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "%s の消失を記録しています"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "インストール後トリガ %s を実行しています"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "ディレクトリ '%s' が見つかりません"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "ファイル '%s' をオープンできませんでした"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "%s を準備しています"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "%s を展開しています"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Preparing to configure %s"
-msgstr "%s の設定を準備しています"
+msgid "Unable to parse Release file %s"
+msgstr "Release ファイル %s を解釈することができません"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Installed %s"
-msgstr "%s をインストールしました"
+msgid "No sections in Release file %s"
+msgstr "Release ファイル %s にセクションがありません"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "%s の削除を準備しています"
+msgid "No Hash entry in Release file %s"
+msgstr "Release ファイル %s に Hash エントリがありません"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Removed %s"
-msgstr "%s を削除しました"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Release ファイル %s に無効な 'Valid-Until' エントリがあります"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "%s を完全に削除する準備をしています"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Release ファイル %s に無効な 'Date' エントリがあります"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Completely removed %s"
-msgstr "%s を完全に削除しました"
+msgid "%lid %lih %limin %lis"
+msgstr "%li日 %li時間 %li分 %li秒"
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Can not write log (%s)"
-msgstr "ログを書き込めません (%s)"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr "/dev/pts はマウントされていますか?"
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr "標準出力はターミナルですか?"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr "操作はそれが完了する前に中断されました"
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr "MaxReports にすでに達しているため、レポートは書き込まれません"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "依存関係の問題 - 未設定のままにしています"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート"
-"は書き込まれません。"
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"エラーメッセージはディスクフルエラーであることを示しているので、レポートは書"
-"き込まれません。"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き"
-"込まれません。"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"エラーメッセージはローカルシステムの問題であることを示しているので、レポート"
-"は書き込まれません。"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"エラーメッセージは dpkg I/O エラーであることを示しているので、レポートは書き"
-"込まれません。"
+msgid "%lih %limin %lis"
+msgstr "%li時間 %li分 %li秒"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"管理用ディレクトリ (%s) をロックできません。これを使う別のプロセスが動いてい"
-"ませんか?"
+msgid "%limin %lis"
+msgstr "%li分 %li秒"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"管理用ディレクトリ (%s) をロックできません。root 権限で実行していますか?"
+msgid "%lis"
+msgstr "%li秒"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"dpkg は中断されました。問題を修正するには '%s' を手動で実行する必要がありま"
-"す。"
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "ロックされていません"
+msgid "Selection %s not found"
+msgstr "選択された %s が見つかりません"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3381,35 +3233,6 @@ msgstr "..."
msgid "%c%s... %u%%"
msgstr "%c%s... %u%%"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li日 %li時間 %li分 %li秒"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li時間 %li分 %li秒"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%li分 %li秒"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%li秒"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "選択された %s が見つかりません"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "空のファイルを mmap できません"
@@ -3472,109 +3295,280 @@ msgstr "マウントポイント %s の状態を取得できません"
msgid "Failed to stat the cdrom"
msgstr "CD-ROM の状態を取得するのに失敗しました"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "理解できない省略形式です: '%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "設定ファイル %s をオープンできませんでした"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。"
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "文法エラー %s:%u: 不正なタグです"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "文法エラー %s:%u: 値の後に余分なゴミが入っています"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "文法エラー %s:%u: 命令はトップレベルでのみ実行できます"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "文法エラー %s:%u: インクルードのネストが多すぎます"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "文法エラー %s:%u: ここからインクルードされています"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "文法エラー %s:%u: 未対応の命令 '%s'"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"文法エラー %s:%u: clear ディレクティブは、引数としてオプションツリーを必要と"
"します"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "コマンドラインオプション '%c' [%s から] は不明です。"
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "コマンドラインオプション %s を理解できません"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "コマンドラインオプション %s は boolean ではありません"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "オプション %s には引数が必要です。"
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "オプション %s: 設定項目には =<値> を指定する必要があります。"
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "オプション %s には '%s' ではなく整数の引数が必要です"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "オプション '%s' は長すぎます"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "%s を解釈することができません。true か false を試してください。"
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "不正な操作 %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "%s をインストールしています"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "%s を設定しています"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "%s を削除しています"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "%s を完全に削除しています"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "%s の消失を記録しています"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "インストール後トリガ %s を実行しています"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "ディレクトリ '%s' が見つかりません"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "ファイル '%s' をオープンできませんでした"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "%s を準備しています"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "%s を展開しています"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "%s の設定を準備しています"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "%s をインストールしました"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "%s の削除を準備しています"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "%s を削除しました"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "%s を完全に削除する準備をしています"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s を完全に削除しました"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, c-format
+msgid "Can not write log (%s)"
+msgstr "ログを書き込めません (%s)"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr "/dev/pts はマウントされていますか?"
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "操作はそれが完了する前に中断されました"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr "MaxReports にすでに達しているため、レポートは書き込まれません"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "依存関係の問題 - 未設定のままにしています"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"エラーメッセージは前の失敗から続くエラーであることを示しているので、レポート"
+"は書き込まれません。"
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"エラーメッセージはディスクフルエラーであることを示しているので、レポートは書"
+"き込まれません。"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"エラーメッセージはメモリ超過エラーであることを示しているので、レポートは書き"
+"込まれません。"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"エラーメッセージはローカルシステムの問題であることを示しているので、レポート"
+"は書き込まれません。"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"エラーメッセージは dpkg I/O エラーであることを示しているので、レポートは書き"
+"込まれません。"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"管理用ディレクトリ (%s) をロックできません。これを使う別のプロセスが動いてい"
+"ませんか?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+"管理用ディレクトリ (%s) をロックできません。root 権限で実行していますか?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"dpkg は中断されました。問題を修正するには '%s' を手動で実行する必要がありま"
+"す。"
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "ロックされていません"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "リンクされているノードで DropNode が呼ばれました"
@@ -3680,7 +3674,7 @@ msgstr "'%s' メンバーがないため、正しい DEB アーカイブでは
msgid "Internal error, could not locate member %s"
msgstr "内部エラー、メンバー %s を特定できません"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "解析できないコントロールファイル"
@@ -3709,23 +3703,23 @@ msgstr "アーカイブが不足しています"
msgid "Failed to read the archive headers"
msgstr "アーカイブヘッダの読み込みに失敗しました"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "パイプの生成に失敗しました"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "gzip の実行に失敗しました"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "壊れたアーカイブ"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "tar チェックサム検証が失敗しました。アーカイブが壊れています"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "未知の TAR ヘッダタイプ %u、メンバー %s"
@@ -3742,6 +3736,9 @@ msgstr "未知の TAR ヘッダタイプ %u、メンバー %s"
#~ msgid "No keyring installed in %s."
#~ msgstr "%s にキーリングがインストールされていません。"
+#~ msgid "Is stdout a terminal?"
+#~ msgstr "標準出力はターミナルですか?"
+
#~ msgid "ioctl(TIOCGWINSZ) failed"
#~ msgstr "ioctl(TIOCGWINSZ) に失敗しました"
diff --git a/po/km.po b/po/km.po
index 12cd1690b..8c72865f8 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2006-10-10 09:48+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
"Language-Team: Khmer <support@khmeros.info>\n"
@@ -26,148 +26,148 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "កញ្ចប់ %s កំណែ %s មាន​ភាព​អាស្រ័យ​មិន​ត្រូវ​គ្នា ៖\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "ឈ្មោះ​កញ្ចប់​សរុប ៖ "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid "Total package structures: "
msgstr "ឈ្មោះ​កញ្ចប់​សរុប ៖ "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " កញ្ចប់​ធម្មតា ៖ "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " កញ្ចប់​និម្មិត​សុទ្ធ ៖ "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " កញ្ចប់​និម្មិត​តែ​មួយ ៖ "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " កញ្ចប់​និម្មិត​លាយ ៖ "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " បាត់បង់ ៖ "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "កំណែ​ផ្សេងៗ​សរុប ៖ "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
#, fuzzy
msgid "Total distinct descriptions: "
msgstr "កំណែ​ផ្សេងៗ​សរុប ៖ "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "ភាព​អាស្រ័យ​សរុប ៖ "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
#, fuzzy
msgid "Total Desc/File relations: "
msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "ការផ្គូរផ្គង​ការផ្ដល់​សរុប ៖ "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "ខ្សែ​អក្សរ​សរុប​ ៖ "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "ទំហំ slack សរុប ៖"
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "ទំហំ​សរុប​ដែល​ទុក​សម្រាប់ ៖ "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "ឯកសារ​កញ្ចប់ %s នៅ​ខាងក្រៅ​ការ​ធ្វើសមកាលកម្ម ។"
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "រក​កញ្ចប់​មិន​ឃើញ"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
#, fuzzy
msgid "You must give at least one search pattern"
msgstr "អ្នក​ត្រូវ​តែ​ផ្ដល់​លំនាំ​មួយ​ដែល​ពិត​ប្រាកដ"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "មិន​អាច​កំណត់​ទីតាំង​កញ្ចប់ %s បានឡើយ"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "ឯកសារ​កញ្ចប់ ៖"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "ឃ្លាំង​សម្ងាត់​ឋិតនៅ​ក្រៅ​ការ​ធ្វើ​សមកាល​កម្ម ដែលមិន​អាច x-ref ឯកសារ​កញ្ចប់​បាន​ទេ"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "កញ្ចប់​ដែល​បាន​ខ្ទាស់ ៖"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(រក​មិន​ឃើញ)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " បាន​ដំឡើង ៖ "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " សាកល្បង ៖ "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(គ្មាន)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " ខ្ទាស់​កញ្ចប់ ៖ "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " តារាង​កំណែ ៖"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, 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:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -240,21 +240,21 @@ msgstr ""
" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
"មើល​ apt-cache(8) និង​ apt.conf(5) សម្រាប់​ព័ត៌មាន​បន្ថែម​​មាន​ក្នុង​ទំព័រ​សៀវភៅដៃ​ ។\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "សូម​ផ្ដល់​ឈ្មោះ​ឲ្យ​ថាស​នេះ ឧទាហរណ៍​ដូចជា 'ដេបៀន 2.1r1 ថាស​ទី ១' ជាដើម"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "សូម​បញ្ចូល​ថាស​ក្នុង​ដ្រាយ​ហើយ​ចុច​បញ្ចូល​"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -262,7 +262,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "ធ្វើដំណើរការ​នេះ​ម្តង​ទៀត​ សម្រាប់​ស៊ីឌី​ទាំងអស់​​ក្នុង​សំណុំ​របស់​អ្នក ។"
@@ -298,83 +298,78 @@ msgstr ""
" -c=? អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ \n"
" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -382,113 +377,113 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។"
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, 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:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -497,24 +492,24 @@ msgstr ""
"ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​"
"តម្រូវការ​កំណែបានឡើយ"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។"
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ"
@@ -621,11 +616,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -639,52 +634,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -904,7 +900,7 @@ msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័
msgid "Unable to accept connection"
msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ"
@@ -993,37 +989,37 @@ msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក
msgid "Unable to connect to %s:%s:"
msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខា​​ល្អ ប៉ុន្តែ ​មិន​អាច​កំណត់​កូនសោ​ស្នាម​ម្រាមដៃ ?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
#, fuzzy
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
-msgstr "មិន​អាច​ប្រតិបត្តិ 'apt-key' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gnupg ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
+msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gnupg ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "ហត្ថលេខា​ខាង​ក្រោម​មិន​ត្រឹមត្រូវ ៖\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1033,31 +1029,31 @@ msgstr "ហត្ថលេខា​ខាងក្រោម​មិន​អា
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "ជ្រើស​បាន​បរាជ័យ​"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "ការតភ្ជាប់​បាន​អស់ពេល​"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល"
@@ -1065,53 +1061,294 @@ msgstr "កំហុស​ក្នុងការ​សរសេរទៅកា
msgid "Waiting for headers"
msgstr "កំពុង​រង់ចាំ​បឋមកថា"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "ជួរ​បឋមកថា​ខូច​"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើបឋមកថាចម្លើយតបមិនត្រឹមត្រូវ"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​​បឋមកថាប្រវែង​​​មាតិកា​មិនត្រឹមត្រូវ​"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​បឋមកថា​ជួរ​មាតិកា​មិន​ត្រឹមត្រូវ​"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូច​​​ជួរ​គាំទ្រ​"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "ទិន្នន័យ​បឋមកថា​ខូច"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "កំហុស​ខាង​ក្នុង​"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " បាន​បរាជ័យ ។"
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " ធ្វើ​រួច"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។"
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ -f ។"
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [បានដំឡើង​]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [បានដំឡើង​]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [បានដំឡើង​]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [បានដំឡើង​]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " ឬ"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (ដោយ​សារតែ​ %s) "
+
+#: apt-private/private-output.cc:696
+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"
+"ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu ​ត្រូវបានបន្ទាប់ "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex កំហុស​ការចងក្រង​ - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "កំហុស​ខាងក្នុង កញ្ចប់​ដំឡើង​ត្រូវ​បាន​ហៅ​​ជាមួយ​កញ្ចប់​ដែល​ខូច !"
@@ -1361,247 +1598,6 @@ msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s
msgid "Package '%s' is not installed, so not removed\n"
msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "កំពុង​កែ​ភាពអាស្រ័យ​..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " បាន​បរាជ័យ ។"
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " ធ្វើ​រួច"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "អ្នក​ប្រហែល​ជា​ចង់រត់ 'apt-get -f install' ដើម្បី​កែ​វា​​ទាំងនេះ​ហើយ ។"
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ -f ។"
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [បានដំឡើង​]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [បានដំឡើង​]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [បានដំឡើង​]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [បានដំឡើង​]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "ប៉ុន្តែ វា​នឹង​មិន​ត្រូវ​បាន​ដំឡើង​ទេ"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " ឬ"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអាស្រ័យ​ដែល​ខុស​គ្នា ៖"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ​បាន​យកចេញ ៖"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​​ធ្វើ​ឲ្យប្រសើ​ឡើង ៖"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "កញ្ចប់​ខាងក្រោម​នឹង​​ត្រូវ​បាន​បន្ទាប ៖"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "កញ្ចប់​រង់ចាំ​ខាងក្រោម​នឹង​ត្រូវ​​បានផ្លាស់​​ប្តូរ​ ៖"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (ដោយ​សារតែ​ %s) "
-
-#: apt-private/private-output.cc:696
-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"
-"ការយកចេញ​នេះ​មិន​ត្រូវ​បានធ្វើ​ទេ​លុះត្រា​តែ​អ្នកដឹង​ថា​​អ្នក​កំពុង​ធ្វើ​អ្វីឲ្យប្រាកដ !"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ %lu ត្រូវ​បានដំឡើង​ថ្មី "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu ត្រូវ​បាន​ដំឡើង​ឡើង​វិញ "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu ​ត្រូវបានបន្ទាប់ "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu ដែលត្រូវ​យក​ចេញ​ ហើយ​ %lu មិន​​បាន​ធ្វើ​ឲ្យ​ប្រសើរឡើយ ។\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex កំហុស​ការចងក្រង​ - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1656,20 +1652,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "វាយ​"
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "វាយ​:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "យក​ ៖"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "យក​ ៖:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1695,17 +1695,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "មិន​អាច​អាន​ %s បានឡើយ"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1779,7 +1779,7 @@ msgstr "នៅខាងលើ​សារ​នេះ​គឺ​សំខាន
msgid "Merging available information"
msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1803,46 +1803,46 @@ msgstr ""
" -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n"
" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "មិន​អាច​ថ្លែង %s បានឡើយ"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "មិន​អាច​សរសេរ​ទៅ %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "មិន​អាច​ទទួល​យក​កំណែ​ debconf  ។ តើ​ debconf បានដំឡើង​ឬ ?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "បញ្ជី​ផ្នែក​បន្ថែម​កញ្ចប់​វែង​ពេក"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "​កំហុស​ដំណើរការ​ថត​ %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "បញ្ជី​ផ្នែក​បន្ថែម​ប្រភព​វែង​ពេក"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "កំហុស​សរសេរ​បឋម​កថា​ទៅ​ឯកសារ​មាតិកា"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "កំហុស​ដំណើរការ​មាតិកា​ %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1923,11 +1923,11 @@ msgstr ""
" -c=? អាន​ឯកសារ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ​\n"
" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "គ្មាន​ការ​ជ្រើស​​ដែល​ផ្គួផ្គង​"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "ឯកសារ​មួយ​ចំនួន​បាត់បងពី​ក្រុម​ឯកសារ​កញ្ចប់​ `%s'"
@@ -2040,22 +2040,22 @@ msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n"
msgid "Archive had no package field"
msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n"
@@ -2141,7 +2141,7 @@ msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់
msgid "Failed to rename %s to %s"
msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2166,11 +2166,11 @@ msgstr ""
" -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n"
" -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "មិន​ស្គាល់​កំណត់​ត្រា​កញ្ចប់ !"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2242,6 +2242,26 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "MD5Sum មិន​ផ្គួផ្គង​"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្ត្រ %s ឡើយ ។"
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។"
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "បញ្ជី​កញ្ចប់​ ឬ ឯកសារ​ស្ថានភាព​មិន​អាចត្រូវបាន​​ញែក ​​ឬ ត្រូវបាន​បើកបានឡើយ​​ ។"
@@ -2254,178 +2274,299 @@ msgstr "អ្នកប្រហែលជា​ចង់ភាពទាន់ស
msgid "The list of sources could not be read."
msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។"
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "ឃ្លាំង​កញ្ចប់​ទទេ​"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "ឯកសារ​ឃ្លាំងសម្ងាត់​​កញ្ចប់​ជាកំណែ​មិន​ត្រូវគ្នា​"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "APT នេះ មិនគាំទ្រ​ប្រព័ន្ធ​ ការធ្វើកំណែនេះទេ​ '%s'"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "ឃ្លាំង​សម្ងាត់​កញ្ចប់ត្រូវ​បានស្ថាបនា់​សម្រាប់ស្ថាបត្យករ​ខុស​ៗគ្នា​​"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "អាស្រ័យ​"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "អាស្រ័យជា​មុន"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "ផ្ដល់យោបល់​"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "ផ្តល់​អនុសាសន៍​"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "ប៉ះទង្គិច"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "ជំនួស​"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "លែង​ប្រើ"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "សំខាន់​"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "បាន​ទាមទារ"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "គំរូ"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "ស្រេចចិត្ត"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "បន្ថែម"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ្ជា​វិធីសាស្ត្រ %s ឡើយ ។"
+msgid "Index file type '%s' is not supported"
+msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
+
+#: apt-pkg/sourcelist.cc:206
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "បន្ទាត់ Malformed %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:208
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "សូម​បញ្ចូល​ស្លាក​ឌីស​ ៖ '%s' ក្នុង​ដ្រាយ​ '%s' ហើយ​សង្កត់​ចូល ។"
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "កំពុងស្ថាបនា​មែកធាងភាពអាស្រ័យ"
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist លែងប្រើ)"
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "កំណែ​សាកល្បង​"
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "ការបង្កើត​ភាពអាស្រ័យ​"
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "កំពុង​បើក​ %s"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)"
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
+
+#: apt-pkg/sourcelist.cc:416
#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
+msgid "Clean of %s is not supported"
+msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "មិនអាច​ថ្លែង %s បានឡើយ ។"
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "ឃ្លាំងសម្ងាត់​មិន​ត្រូវ​គ្នា​នឹង ប្រព័ន្ធ ធ្វើកំណែ"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​​  ។"
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
+
+#: apt-pkg/pkgcachegen.cc:279
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
+
+#: apt-pkg/pkgcachegen.cc:591
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ"
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (%s -> %s) ។"
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum មិន​ផ្គួផ្គង​"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "ការសរសេរ​មានកំហុស"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2433,7 +2574,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
@@ -2449,49 +2590,49 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2500,124 +2641,53 @@ msgstr ""
"ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ "
"(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។"
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "ឃ្លាំងសម្ងាត់​មិន​ត្រូវ​គ្នា​នឹង ប្រព័ន្ធ ធ្វើកំណែ"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​ឈ្មោះ​កញ្ចប់​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​​  ។"
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
-
-#: apt-pkg/pkgcachegen.cc:279
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "អស្ចារ្យ​, អ្នក​មាន​ភាពអាស្រ័យ​លើស​ចំនួន​ APT នេះ​ឆបគ្នា​ ។"
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "កញ្ចប់​ %s %s រក​មិន​ឃើញ​ខណៈ​ពេល​កំពុង​ដំណើរការ​ភាពអាស្រ័យ​​ឯកសារ"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "កំពុង​អាន​បញ្ជី​កញ្ចប់"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដុំ"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "ប្លុក​ក្រុមហ៊ុន​លក់​ %s គ្មាន​ស្នាម​ផ្តិត​ម្រាម​ដៃ"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "ថត​ប័ណ្ណសារ​ %spartial គឺ​បាត់បង់​ ។"
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​"
+msgid "Unable to lock directory %s"
+msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "កំពុង​ទៅ​យក​ឯកសារ %li នៃ %li (នៅសល់ %s)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "កំពុង​ទៅយក​ឯកសារ %li នៃ %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​​ទាញ​យក ​ពួកវាត្រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។"
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "អ្នកត្រូវតែដាក់ 'ប្រភព' URIs មួយចំនួន​នៅក្នុង sources.list របស់អ្នក"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "មិនអាច​ថ្លែង %s បានឡើយ ។"
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2639,19 +2709,19 @@ msgstr "មិន​បាន​យល់​ពី​ប្រភេទ​ម្
msgid "No priority (or zero) specified for pin"
msgstr "គ្មាន​អទិភាព (ឬ សូន្យ​) បានបញ្ជាក់​សម្រាប់​ម្ជុល​ទេ"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2662,10 +2732,13 @@ msgstr ""
"ភាពអាស្រ័យជាមុន ។ ជាញឹកញាប់គឺ មិនត្រឹមត្រូវ ប៉ុន្តែ ប្រសិនបើអ្នក​ពិតជាចង់ធ្វើវា ធ្វើឲ្យជម្រើស APT::"
"Force-LoopBreak សកម្ម ។"
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "បន្ទាត់​ %u មាន​ប្រវែង​វែងពេកនៅ​ក្នុង​បញ្ជី​ប្រភព​ %s ។"
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​​ទាញ​យក ​ពួកវាត្រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។"
#: apt-pkg/cdrom.cc:571
#, fuzzy
@@ -2733,11 +2806,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "កំពុង​ចម្លង​បញ្ជី​កញ្ចប់..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "កំពុងសរសេរ​បញ្ជី​ប្រភព​ថ្មី\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "ធាតុបញ្ចូល​បញ្ជីប្រភព​សម្រាប់​ឌីស​នេះគឺ ៖\n"
@@ -2747,7 +2820,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "កញ្ចប់ %s ត្រូវការឲ្យដំឡើង ប៉ុន្តែ​ ខ្ញុំ​មិន​អាច​រក​ប័ណ្ណសារ​សម្រាប់​វា​បាន​ទេ​ ។"
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2755,139 +2828,41 @@ msgstr ""
"កំហុស pkgProblemResolver::ដោះស្រាយ​សញ្ញាបញ្ឈប់​ដែលបានបង្កើត នេះ​ប្រហែលជា បង្កដោយកញ្ចប់​"
"ដែលបាន​ទុក ។"
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។"
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ"
-
-#: apt-pkg/indexrecords.cc:83
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-
-#: apt-pkg/indexrecords.cc:91
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:152
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "កំពុងស្ថាបនា​មែកធាងភាពអាស្រ័យ"
-#: apt-pkg/sourcelist.cc:170
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "កំណែ​សាកល្បង​"
-#: apt-pkg/sourcelist.cc:173
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "ការបង្កើត​ភាពអាស្រ័យ​"
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/depcache.cc:252
#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
+msgid "Failed to open StateFile %s"
+msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:258
#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "បន្ទាត់ Malformed %lu ក្នុង​ញ្ជី​ប្រភព​ %s (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "បន្ទាត់​ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (URI ញែក​)"
-
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist លែងប្រើ)"
-
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "បន្ទាត់ Malformed %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
-
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "កំពុង​បើក​ %s"
-
-#: apt-pkg/sourcelist.cc:371
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
-
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើបន្ទាត់​ %u ក្នុង​បញ្ជី​ប្រភព​ %s ឡើយ"
+msgid "Unable to parse package file %s (%d)"
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (%d) បានឡើយ"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2899,208 +2874,101 @@ msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ
msgid "Version '%s' for '%s' was not found"
msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
+#: apt-pkg/indexrecords.cc:83
#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "បាន​ដំឡើង %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "កំពុង​កំណត់​រចនា​សម្ព័ន្ធ %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "កំពុង​យក %s ចេញ"
+msgid "Unable to parse Release file %s"
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/indexrecords.cc:91
#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "No sections in Release file %s"
+msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
-#: apt-pkg/deb/dpkgpm.cc:112
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Running post-installation trigger %s"
+msgid "No Hash entry in Release file %s"
msgstr ""
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/indexrecords.cc:145
#, fuzzy, c-format
-msgid "Directory '%s' missing"
-msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/indexrecords.cc:164
#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "កំពុងរៀបចំ​ %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "កំពុង​ស្រាយ %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "កំពុងរៀបចំ​កំណត់រចនាសម្ព័ន្ធ %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1012
-#, c-format
-msgid "Installed %s"
-msgstr "បាន​ដំឡើង %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1017
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចេញ​នៃ %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, c-format
-msgid "Removed %s"
-msgstr "បាន​យក %s ចេញ"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង​ស្រុង"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Completely removed %s"
-msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "មិន​អាច​សរសេរ​ទៅ %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
+#, c-format
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "%lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
+msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3235,35 +3103,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... ធ្វើរួច​"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "មិនអាច mmap ឯកសារទទេ​បានឡើយ"
@@ -3326,107 +3165,263 @@ msgstr "មិនអាច​ថ្លែង ចំណុចម៉ោន %s ប
msgid "Failed to stat the cdrom"
msgstr "បរាជ័យក្នុងការ​ថ្លែង ស៊ីឌីរ៉ូម"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "មិន​បាន​​ទទួល​ស្គាល់​ប្រភេទ​អក្សរ​សង្ខេប ៖ '%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ ប្លុក​ចាប់​ផ្តើម​​ដោយ​គ្មាន​ឈ្មោះ​ ។"
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ ស្លាក​ដែលបាន Malformed"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ តម្លៃ​ឥតបានការ​នៅ​ក្រៅ​"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដីបង្គាប់​អាចត្រូវបានធ្វើ​តែនៅលើ​កម្រិត​កំពូល​តែប៉ុណ្ណោះ"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ មាន​ការរួមបញ្ចូល​ដែលដាក់​រួមគ្នា​យ៉ាងច្រើន"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ បានរួម​បញ្ចូល​ពី​ទីនេះ​"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដី​បង្គាប់​ដែល​មិនបានគាំទ្រ '%s'"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, fuzzy, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដីបង្គាប់​អាចត្រូវបានធ្វើ​តែនៅលើ​កម្រិត​កំពូល​តែប៉ុណ្ណោះ"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ សារឥតបានការ​បន្ថែម ដែលនៅខាងចុង​ឯកសារ"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "ជម្រើស​បន្ទាត់​ពាក្យបញ្ជា '%c' [from %s] មិនស្គាល់ឡើយ ។"
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "មិនយល់​ពី​ជម្រើស​បន្ទាត់​ពាក្យ​បញ្ជា %s ឡើយ"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "ជម្រើស​បន្ទាត់ពាក្យ​បញ្ជា​ %s មិនមែនជាប៊ូលីនទេ"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "ជម្រើស​ %s ត្រូវការ​អាគុយម៉ង់មួយ ។"
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "ជម្រើស %s ៖ ការបញ្ជាក់​ធាតុ​កំណត់រចនាសម្ព័ន្ធត្រូវតែមាន =<val> មួយ ។"
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "ជម្រើស​ %s ត្រូវ​ការ​អាគុយម៉ង់​ចំនួន​គត់​ មិន​មែន​ '%s'"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "ជម្រើស​ '%s' វែងពេក"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "មិនបានយល់អំពី​ការស្គាល់​ %s ឡើយ សូមព្យាយមយក​ ពិត​ ​​​ឫ មិន​ពិត ។"
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "ប្រតិបត្តិការ​មិន​ត្រឹមត្រូវ​ %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "បាន​ដំឡើង %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "កំពុង​កំណត់​រចនា​សម្ព័ន្ធ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "កំពុង​យក %s ចេញ"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "កំពុងរៀបចំ​ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "កំពុង​ស្រាយ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "កំពុងរៀបចំ​កំណត់រចនាសម្ព័ន្ធ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "បាន​ដំឡើង %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "កំពុងរៀបចំដើម្បី​ការយក​ចេញ​នៃ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "បាន​យក %s ចេញ"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "កំពុង​រៀបចំ​យក %s ចេញ​ទាំង​ស្រុង"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "មិន​អាច​សរសេរ​ទៅ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "ទម្លាក់​ថ្នាំង​ដែល​បាន​ហៅ​លើ​ថ្នាំងដែល​នៅតែតភ្ជាប់"
@@ -3531,7 +3526,7 @@ msgstr "នេះ​ជាមិនមែនជា​ប័ណ្ណសារ​
msgid "Internal error, could not locate member %s"
msgstr "កំហុស​ខាងក្នុង ​មិន​អាច​កំណត់​ទីតាំង​សមាជិក​ %s បានឡើយ"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "ឯកសារត្រួតពិនិត្យ​ដែលមិនអាច​ញែកបាន"
@@ -3560,23 +3555,23 @@ msgstr "ប័ណ្ណសារ ខ្លីពេក"
msgid "Failed to read the archive headers"
msgstr "បរាជ័យ​ក្នុងការ​អាន​បឋមកថា​ប័ណ្ណសារ"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "បាន​បរាជ័យក្នុង​ការ​បង្កើត​បំពង់​"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "បាន​បរាជ័យក្នុង​ការ​ប្រតិបត្តិ gzip"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "ប័ណ្ណសារ​បាន​ខូច​"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar ឆេកសាំ​បាន​បរាជ័យ ប័ណ្ណសារ​បាន​ខូច"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "មិន​ស្គាល់​ប្រភេទ​បឋមកថា​ TAR %u ដែលជា​សមាជិក​ %s"
diff --git a/po/ko.po b/po/ko.po
index b234a46c7..51cc27d61 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2010-08-30 02:31+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -20,144 +20,144 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "%s 패키지의 %s 버전의 의존성이 맞지 않습니다:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "전체 패키지 이름 : "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "전체 패키지 구조: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " 일반 패키지: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " 순수 가상 패키지: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " 단일 가상 패키지: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " 혼합 가상 패키지: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " 빠짐: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "개별 버전 전체: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "개별 설명 전체: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "전체 의존성: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "전체 버전/파일 관계: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "전체 설명/파일 관계: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "전체 제공 매핑: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "전체 패턴 문자열: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "전체 빈 용량: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "차지하는 전체 용량: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "패키지 파일 %s 파일이 동기화되지 않았습니다."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "패키지가 없습니다"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "최소 한 개의 검색어를 지정해야 합니다"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "%s 패키지를 찾을 수 없습니다"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "패키지 파일:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "캐시가 동기화되지 않았습니다. 패키지 파일을 상호 참조할 수 없습니다"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "핀 패키지:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(없음)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " 설치: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " 후보: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(없음)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " 패키지 핀: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " 버전 테이블:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s(%s), 컴파일 시각 %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -231,20 +231,20 @@ msgstr ""
" -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
"좀 더 자세한 정보는 apt-cache(8) 및 apt.conf(5) 매뉴얼 페이지를 보십시오.\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "이 디스크의 이름을 정하십시오 (예: 'Debian 5.0.3 Disk 1')"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "드라이브에 디스크를 넣고 Enter를 누르십시오"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -252,7 +252,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "현재 갖고 있는 다른 CD에도 이 과정을 반복하십시오."
@@ -288,76 +288,71 @@ msgstr ""
" -c=? 해당 설정 파일을 읽습니다\n"
" -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "소스 패키지로 '%s'을(를) '%s' 대신 선택합니다\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "'%2$s' 패키지의 '%1$s' 버전은 없으므로 무시합니다."
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "%s 패키지를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 패키지 수동설치로 지정합니다.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s 패키지는 수동설치로 지정합니다.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "%s 디렉터리를 잠글 수 없습니다"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "다운로드 디렉터리를 잠글 수 없습니다"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s의 소스 패키지를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -366,7 +361,7 @@ msgstr ""
"알림: '%s' 패키징은 다음 '%s' 버전 컨트롤 시스템에서 관리합니다:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -377,94 +372,94 @@ msgstr ""
"다음과 같이 하십시오:\n"
"bzr get %s\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "%s 소스를 가져옵니다\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "일부 아카이브를 가져오는데 실패했습니다."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "압축 풀기 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "빌드 명령 '%s' 실패.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "하위 프로세스가 실패했습니다"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "빌드 의존성을 처리하는데 실패했습니다"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 패키지에 빌드 의존성이 없습니다.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -473,7 +468,7 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -482,14 +477,14 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, 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:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -498,7 +493,7 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버"
"전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -507,17 +502,17 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
"다"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: %3$s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "빌드 의존성을 처리하는데 실패했습니다"
@@ -627,11 +622,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -645,52 +640,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "하지만 설치하지 않았습니다"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s 패키지 수동설치로 지정합니다.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s 패키지는 수동설치로 지정합니다.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s 패키지는 이미 최신 버전입니다.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s 패키지는 이미 최신 버전입니다.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "%s 패키지 수동설치로 지정합니다.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "%s 파일을 여는데 실패했습니다"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -911,7 +907,7 @@ msgstr "데이터 소켓 연결 시간 초과"
msgid "Unable to accept connection"
msgstr "연결을 받을 수 없습니다"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "파일 해싱에 문제가 있습니다"
@@ -1000,38 +996,38 @@ msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생
msgid "Unable to connect to %s:%s:"
msgstr "%s:%s에 연결할 수 없습니다:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "내부 오류: 서명은 올바르지만 키 핑거프린트를 확인할 수 없습니다?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "최소한 하나 이상의 서명이 잘못되었습니다."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"서명을 확인하는 'apt-key' 프로그램을 실행할 수 없습니다. (gnupg를 설치했습니"
"까?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "apt-key 실행 도중 알 수 없는 오류 발생"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "다음 서명이 올바르지 않습니다:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1041,31 +1037,31 @@ msgstr "다음 서명들은 공개키가 없기 때문에 인증할 수 없습
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "해당 파일에 쓰는데 오류가 발생했습니다"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "서버에서 읽고 연결을 닫는데 오류가 발생했습니다"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "서버에서 읽는데 오류가 발생했습니다"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "파일에 쓰는데 오류가 발생했습니다"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "select가 실패했습니다"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "연결 시간이 초과했습니다"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "출력 파일에 쓰는데 오류가 발생했습니다"
@@ -1073,53 +1069,296 @@ msgstr "출력 파일에 쓰는데 오류가 발생했습니다"
msgid "Waiting for headers"
msgstr "헤더를 기다리는 중입니다"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "헤더 줄이 잘못되었습니다"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "데이터 형식을 알 수 없습니다"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "헤더 데이터가 잘못되었습니다"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "연결이 실패했습니다"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "내부 오류"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "의존성을 바로잡는 중입니다..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " 실패."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "의존성을 바로잡을 수 없습니다"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "업그레이드 집합을 최소화할 수 없습니다"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " 완료"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [설치함]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [설치함]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [설치함]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [설치함]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "하지만 %s 패키지를 설치했습니다"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "하지만 %s 패키지를 설치할 것입니다"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "하지만 설치할 수 없습니다"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "하지만 가상 패키지입니다"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "하지만 설치하지 않았습니다"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "하지만 %s 패키지를 설치하지 않을 것입니다"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " 혹은"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "다음 패키지의 의존성이 맞지 않습니다:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "다음 새 패키지를 설치할 것입니다:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "다음 패키지를 지울 것입니다:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "다음 패키지를 과거 버전으로 유지합니다:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "다음 패키지를 업그레이드할 것입니다:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "다음 패키지를 다운그레이드할 것입니다:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "고정되었던 다음 패키지를 바꿀 것입니다:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (%s때문에) "
+
+#: apt-private/private-output.cc:696
+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"
+"무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu개 업그레이드, %lu개 새로 설치, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu개 다시 설치, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu개 업그레이드, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "정규식 컴파일 오류 - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "update 명령은 인수를 받지 않습니다"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"알림: 시험 동작입니다!\n"
+" 실행하려면 apt-get을 실행할 때 루트 권한이 필요합니다.\n"
+" 또 잠금 기능을 사용하지 않는 상태이므로, 현재 상황에 의존하지\n"
+" 않도록 하십시오!"
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습니다!"
@@ -1374,249 +1613,6 @@ msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
msgid "Package '%s' is not installed, so not removed\n"
msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "의존성을 바로잡는 중입니다..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " 실패."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "의존성을 바로잡을 수 없습니다"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "업그레이드 집합을 최소화할 수 없습니다"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " 완료"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"이 상황을 바로잡으려면 'apt-get -f install'을 실행해야 할 수도 있습니다."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "의존성이 맞지 않습니다. -f 옵션을 사용해 보십시오."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [설치함]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [설치함]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [설치함]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [설치함]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "하지만 %s 패키지를 설치했습니다"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "하지만 %s 패키지를 설치할 것입니다"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "하지만 설치할 수 없습니다"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "하지만 가상 패키지입니다"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "하지만 설치하지 않았습니다"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "하지만 %s 패키지를 설치하지 않을 것입니다"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " 혹은"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "다음 패키지의 의존성이 맞지 않습니다:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "다음 새 패키지를 설치할 것입니다:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "다음 패키지를 지울 것입니다:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "다음 패키지를 과거 버전으로 유지합니다:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "다음 패키지를 업그레이드할 것입니다:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "다음 패키지를 다운그레이드할 것입니다:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "고정되었던 다음 패키지를 바꿀 것입니다:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (%s때문에) "
-
-#: apt-private/private-output.cc:696
-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"
-"무슨 일을 하고 있는 지 정확히 알지 못한다면 지우지 마십시오!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu개 업그레이드, %lu개 새로 설치, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu개 다시 설치, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu개 업그레이드, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[y/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "정규식 컴파일 오류 - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "update 명령은 인수를 받지 않습니다"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"알림: 시험 동작입니다!\n"
-" 실행하려면 apt-get을 실행할 때 루트 권한이 필요합니다.\n"
-" 또 잠금 기능을 사용하지 않는 상태이므로, 현재 상황에 의존하지\n"
-" 않도록 하십시오!"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1670,20 +1666,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "기존 "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "기존:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "받기:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "받기:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "무시"
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "무시:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "오류 "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "오류:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1709,17 +1709,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "%s을(를) 읽을 수 없습니다"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1792,7 +1792,7 @@ msgstr "오류만 중요합니다. 이 오류를 고친 다음에 설치(I)를
msgid "Merging available information"
msgstr "이용 가능 패키지 정보를 합칩니다"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1816,46 +1816,46 @@ msgstr ""
" -c=? 설정 파일을 읽습니다\n"
" -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "%s의 정보를 읽을 수 없습니다"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "%s에 쓸 수 없습니다"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "debconf 버전을 알 수 없습니다. debconf가 설치되었습니까?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "패키지 확장 목록이 너무 깁니다"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "%s 디렉터리를 처리하는데 오류가 발생했습니다"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "소스 확장 목록이 너무 깁니다"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "컨텐츠 파일에 헤더를 쓰는데 오류가 발생했습니다"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "%s 컨텐츠를 처리하는데 오류가 발생했습니다"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1936,11 +1936,11 @@ msgstr ""
" -c=? 이 설정 파일을 읽습니다\n"
" -o=? 임의의 옵션을 설정합니다"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "맞는 패키지가 없습니다"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "`%s' 패키지 파일 그룹에 몇몇 파일이 빠졌습니다"
@@ -2054,22 +2054,22 @@ msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n"
msgid "Archive had no package field"
msgstr "아카이브에 패키지 필드가 없습니다"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s에는 override 항목이 없습니다\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 관리자가 %s입니다 (%s 아님)\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s에는 source override 항목이 없습니다\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s에는 binary override 항목이 없습니다\n"
@@ -2155,7 +2155,7 @@ msgstr "%s의 링크를 해제하는데 문제가 있습니다"
msgid "Failed to rename %s to %s"
msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2180,11 +2180,11 @@ msgstr ""
" -c=? 설정 파일을 읽습니다\n"
" -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "알 수 없는 패키지 기록!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2257,6 +2257,27 @@ msgstr "다음의 인증 기록을 찾을 수 없습니다: %s"
msgid "Hash mismatch for: %s"
msgstr "다음의 해시가 다릅니다: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다."
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 넣고 Enter를 누르십시오."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "패키지 목록이나 상태 파일을 파싱할 수 없거나 열 수 없습니다."
@@ -2269,177 +2290,298 @@ msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습
msgid "The list of sources could not be read."
msgstr "소스 목록을 읽을 수 없습니다."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "패키지 캐시가 비어 있습니다"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "패키지 캐시 파일이 손상되었습니다"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "패키지 캐시 파일이 호환되지 않는 버전입니다"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "패키지 캐시 파일이 손상되었습니다"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "이 APT는 '%s' 버전 시스템을 지원하지 않습니다"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "패키지 캐시가 다른 아키텍쳐용입니다."
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "의존"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "미리의존"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "제안"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "추천"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "충돌"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "대체"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "없앰"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "망가뜨림"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "향상"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "중요"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "필수"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "표준"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "옵션"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "별도"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "업그레이드를 계산하는 중입니다"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "설치 방법 드라이버 %s을(를) 찾을 수 없습니다."
+msgid "Index file type '%s' is not supported"
+msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 파싱 불가)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 너무 짧음)"
+
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 대입이 아님)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 키가 없음)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
-"'%2$s' 드라이브에 '%1$s'(으)로 표기된 디스크를 넣고 Enter를 누르십시오."
+"소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] %4$s 키에 값이 없음)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:206
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s 파일을 여는 중입니다"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
+
+#: apt-pkg/sourcelist.cc:375
+#, 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:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "의존성 트리를 만드는 중입니다"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s의 정보를 읽을 수 없습니다."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "후보 버전"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "캐시의 버전 시스템이 호환되지 않습니다"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "의존성 만들기"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "상태 정보를 읽는 중입니다"
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
+
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "상태파일 %s 여는데 실패했습니다"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "임시 상태파일 %s 쓰는데 실패했습니다"
+msgid "Couldn't stat source package list %s"
+msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "패키지 목록을 읽는 중입니다"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "파일에서 제공하는 것을 모으는 중입니다"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "해시 합이 맞지 않습니다"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "크기가 맞지 않습니다"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "잘못된 작업 %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "쓰기 오류"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2449,7 +2591,7 @@ msgstr ""
"예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 오류: %s: %s"
@@ -2465,49 +2607,49 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "다음 키 ID의 공개키가 없습니다:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2516,125 +2658,54 @@ msgstr ""
"%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습"
"니다. (아키텍쳐가 빠졌기 때문입니다)"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "캐시의 버전 시스템이 호환되지 않습니다"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 패키지 이름 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 버전 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 설명 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "우와, 이 APT가 처리할 수 있는 의존성 개수를 넘어갔습니다."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "패키지 목록을 읽는 중입니다"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "파일에서 제공하는 것을 모으는 중입니다"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "벤더 블럭 %s의 핑거프린트가 없습니다"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "목록 디렉터리 %spartial이 빠졌습니다."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "아카이브 디렉터리 %spartial이 빠졌습니다."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "인덱스 파일 타입 '%s' 타입은 지원하지 않습니다"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "%s 디렉터리를 잠글 수 없습니다"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "파일 받아오는 중: %2$li 중 %1$li (%3$s 남았음)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "파일 받아오는 중: %2$li 중 %1$li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"일부 인덱스 파일을 다운로드하는데 실패했습니다. 해당 파일을 무시하거나 과거"
-"의 버전을 대신 사용합니다."
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "sources.list에 '소스' URI를 써 넣어야 합니다"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s의 정보를 읽을 수 없습니다."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2656,7 +2727,7 @@ msgstr "핀 타입 %s이(가) 무엇인지 이해할 수 없습니다"
msgid "No priority (or zero) specified for pin"
msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2665,12 +2736,12 @@ msgstr ""
"'%s'에 대해 즉시 설정을 할 수 없습니다. 자세한 설명은 man 5 apt.conf 페이지에"
"서 APT::Immediate-Configure 항목을 보십시오. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "'%s' 파일을 열 수 없습니다"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2681,10 +2752,14 @@ msgstr ""
"잠깐 제거해야 합니다. 이 패키지를 제거하는 건 좋지 않지만, 정말 지우려면 "
"APT::Force-LoopBreak 옵션을 켜십시오."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"일부 인덱스 파일을 다운로드하는데 실패했습니다. 해당 파일을 무시하거나 과거"
+"의 버전을 대신 사용합니다."
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2753,11 +2828,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "패키지 목록을 복사하는 중입니다..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "새 소스 리스트를 쓰는 중입니다\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "이 디스크의 소스 리스트 항목은 다음과 같습니다:\n"
@@ -2768,7 +2843,7 @@ msgid ""
msgstr ""
"%s 패키지를 다시 설치해야 하지만, 이 패키지의 아카이브를 찾을 수 없습니다."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2776,140 +2851,40 @@ msgstr ""
"오류, pkgProblemResolver::Resolve가 망가졌습니다. 고정 패키지때문에 발생할 수"
"도 있습니다."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Release 파일 %s에 섹션이 없습니다"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Release 파일 %s에 Hash 항목이 없습니다"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Release 파일 %s에 'Date' 항목이 잘못되었습니다"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 파싱 불가)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 너무 짧음)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 대입이 아님)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 키가 없음)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] %4$s 키에 값이 없음)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "의존성 트리를 만드는 중입니다"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "후보 버전"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "의존성 만들기"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "상태 정보를 읽는 중입니다"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "%s 파일을 여는 중입니다"
+msgid "Failed to open StateFile %s"
+msgstr "상태파일 %s 여는데 실패했습니다"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "임시 상태파일 %s 쓰는데 실패했습니다"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, 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:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
+msgid "Unable to parse package file %s (%d)"
+msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2921,42 +2896,42 @@ msgstr "%2$s 패키지의 '%1$s' 릴리즈를 찾을 수 없습니다"
msgid "Version '%s' for '%s' was not found"
msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "'%s' 작업을 찾을 수 없습니다"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "'%s' 패키지는 가상 패키지이므로 버전을 선택할 수 없습니다"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "'%s' 패키지에서 최신 버전을 선택할 수 없습니다. 가상 패키지입니다."
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "'%s' 패키지에서 후보 버전을 선택할 수 없습니다. 후보가 없습니다."
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "'%s' 패키지에서 설치한 버전을 선택할 수 없습니다. 설치하지 않았습니다."
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2965,175 +2940,59 @@ msgstr ""
"'%s' 패키지에서 설치한 버전이나 후보 버전을 선택할 수 없습니다. 둘 다 아닙니"
"다."
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "%s 설치하는 중입니다"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "%s 설정 중입니다"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "%s 패키지를 지우는 중입니다"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "%s 패키지를 완전히 지우는 중입니다"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "%s 사라짐 발견했습니다"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "설치 후 트리거 %s 실행하는 중입니다"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "디렉터리 '%s' 없습니다."
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "'%s' 파일을 열 수 없습니다"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "%s 준비 중입니다"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Unpacking %s"
-msgstr "%s 푸는 중입니다"
+msgid "Unable to parse Release file %s"
+msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Preparing to configure %s"
-msgstr "%s 패키지를 설정할 준비하는 중입니다"
+msgid "No sections in Release file %s"
+msgstr "Release 파일 %s에 섹션이 없습니다"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Installed %s"
-msgstr "%s 설치"
+msgid "No Hash entry in Release file %s"
+msgstr "Release 파일 %s에 Hash 항목이 없습니다"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "%s 패키지를 지울 준비하는 중입니다"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Removed %s"
-msgstr "%s 지움"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Release 파일 %s에 'Date' 항목이 잘못되었습니다"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다"
+msgid "%lid %lih %limin %lis"
+msgstr "%li일 %li시간 %li분 %li초"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Completely removed %s"
-msgstr "%s 패키지를 완전히 지웠습니다"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "%s에 쓸 수 없습니다"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr "보고서를 작성하지 않습니다. 이미 MaxReports 값에 도달했습니다."
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수"
-"적인 오류입니다."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다."
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다."
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다."
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"보고서를 작성하지 않습니다. 오류 메시지에 따르면 dpkg 입출력 오류입니다."
+msgid "%lih %limin %lis"
+msgstr "%li시간 %li분 %li초"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"관리 디렉터리를 (%s) 잠글 수 없습니다. 다른 프로세스가 사용하고 있지 않습니"
-"까?"
+msgid "%limin %lis"
+msgstr "%li분 %li초"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "관리 디렉터리를 (%s) 잠글 수 없습니다. 루트 사용자가 맞습니까?"
+msgid "%lis"
+msgstr "%li초"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"dpkg가 중단되었습니다. 수동으로 '%s' 명령을 실행해 문제점을 바로잡으십시오."
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "잠기지 않음"
+msgid "Selection %s not found"
+msgstr "선택한 %s이(가) 없습니다"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3268,35 +3127,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... 완료"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li일 %li시간 %li분 %li초"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li시간 %li분 %li초"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%li분 %li초"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%li초"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "선택한 %s이(가) 없습니다"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "빈 파일에 메모리 매핑할 수 없습니다"
@@ -3359,107 +3189,272 @@ msgstr "마운트 위치 %s의 정보를 읽을 수 없습니다"
msgid "Failed to stat the cdrom"
msgstr "CD-ROM의 정보를 읽을 수 없습니다"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "이 타입 줄임말을 알 수 없습니다: '%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "설정 파일 %s 파일을 여는 중입니다"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "문법 오류 %s:%u: 블럭이 이름으로 시작하지 않습니다."
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "문법 오류 %s:%u: 태그의 형식이 잘못되었습니다"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "문법 오류 %s:%u: 값 뒤에 쓰레기 데이터가 더 있습니다"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "문법 오류 %s:%u: 지시어는 맨 위 단계에서만 쓸 수 있습니다"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "문법 오류 %s:%u: include가 너무 많이 겹쳐 있습니다"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "문법 오류 %s:%u: 여기서 include됩니다"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "문법 오류 %s:%u: clear 지시어는 인수로 option 트리를 지정해야 합니다"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "명령행 옵션 '%c' 옵션을 [%s에서] 알 수 없습니다."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "명령행 옵션 '%s' 옵션을 알 수 없습니다"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "명령행 옵션 '%s' 옵션은 불리언이 아닙니다"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "%s 옵션에는 인수가 필요합니다."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "%s 옵션: 설정 항목 지정은 =<값> 형태여야 합니다."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "%s 옵션에는 정수 인수가 필요합니다. '%s'이(가) 아닙니다"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "'%s' 옵션이 너무 깁니다"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "%s 센스를 이해할 수 없습니다. 참 아니면 거짓으로 해 보십시오."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "잘못된 작업 %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "%s 설치하는 중입니다"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "%s 설정 중입니다"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "%s 패키지를 지우는 중입니다"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "%s 패키지를 완전히 지우는 중입니다"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "%s 사라짐 발견했습니다"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "설치 후 트리거 %s 실행하는 중입니다"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "디렉터리 '%s' 없습니다."
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "'%s' 파일을 열 수 없습니다"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "%s 준비 중입니다"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "%s 푸는 중입니다"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "%s 패키지를 설정할 준비하는 중입니다"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "%s 설치"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "%s 패키지를 지울 준비하는 중입니다"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "%s 지움"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "%s 패키지를 완전히 지울 준비를 하는 중입니다"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s 패키지를 완전히 지웠습니다"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "%s에 쓸 수 없습니다"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr "보고서를 작성하지 않습니다. 이미 MaxReports 값에 도달했습니다."
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수"
+"적인 오류입니다."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다."
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다."
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다."
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"보고서를 작성하지 않습니다. 오류 메시지에 따르면 dpkg 입출력 오류입니다."
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"관리 디렉터리를 (%s) 잠글 수 없습니다. 다른 프로세스가 사용하고 있지 않습니"
+"까?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "관리 디렉터리를 (%s) 잠글 수 없습니다. 루트 사용자가 맞습니까?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"dpkg가 중단되었습니다. 수동으로 '%s' 명령을 실행해 문제점을 바로잡으십시오."
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "잠기지 않음"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "DropNode가 아직 연결되어 있는 노드에 대해 호출되었습니다"
@@ -3564,7 +3559,7 @@ msgstr "올바른 DEB 아카이브가 아닙니다. '%s' 멤버가 없습니다"
msgid "Internal error, could not locate member %s"
msgstr "내부 오류, %s 멤버를 찾을 수 없습니다"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "control 파일을 파싱할 수 없습니다"
@@ -3593,23 +3588,23 @@ msgstr "아카이브 길이가 너무 짧습니다"
msgid "Failed to read the archive headers"
msgstr "아카이브 헤더를 읽는데 실패했습니다"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "파이프 만들기가 실패했습니다"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "gzip 실행이 실패했습니다"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "아카이브가 손상되었습니다"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "tar 체크섬 실패, 아카이브가 손상되었습니다"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "알 수 없는 TAR 헤더 타입 %u, 멤버 %s"
diff --git a/po/ku.po b/po/ku.po
index 11e68f301..540307937 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-ku\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2008-05-08 12:48+0200\n"
"Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
"Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -24,148 +24,148 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr ""
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Navên paketan bi giştî :"
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid "Total package structures: "
msgstr "Navên paketan bi giştî :"
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Pakêtên normal:"
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Pakêtên farazî yên safî:"
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Pakêta tenê ya farazî:"
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Pakêtên hevbeş yên farazî:"
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Winda: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Guhertoyên vekirî yên giştî:"
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
#, fuzzy
msgid "Total distinct descriptions: "
msgstr "Guhertoyên vekirî yên giştî:"
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Bindestên giştî:"
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr ""
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
#, fuzzy
msgid "Total Desc/File relations: "
msgstr "Guhertoyên vekirî yên giştî:"
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr ""
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr ""
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Cihê giştî yê sist:"
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Cihê giştî yê veqetandî: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakêta dosya %s li derveyî demê ye."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Pakêt nayên dîtin"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
#, fuzzy
msgid "You must give at least one search pattern"
msgstr "Pêwist e tu mînakekê bidî"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Pakêt nehate dîtin %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Pelgehên Pakêt:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr ""
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(nehate dîtin)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Sazkirî: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Berendam: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(ne tiştek)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Destika pakêtê:"
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Tabloya guhertoyan:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, 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:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -202,21 +202,21 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Ji kerema xwe re navekî li vî Dîsketî bike, wekî 'Debian 2.1r1 Disk 1'"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Anîna %s %s biserneket\n"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -224,7 +224,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
@@ -260,83 +260,78 @@ msgstr ""
" -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar bike. "
"mînak -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Nikarî pakêta %s bibîne"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Nikarî pakêta %s bibîne"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Nikarî pakêta %s bibîne"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Nikarî pakêta %s bibîne"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "lê %s dê were sazkirin"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "lê %s dê were sazkirin"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "W: pelrêça %s nayê xwendin\n"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Pelrêça daxistinê nayê quflekirin"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -344,137 +339,137 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Çavkanîna %s bîne\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Anîna çend arşîvan biserneket."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr ""
@@ -541,11 +536,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr ""
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -559,52 +554,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "lê ne sazkirî ye"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "lê %s dê were sazkirin"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "lê %s dê were sazkirin"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s jixwe guhertoya nûtirîn e.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s jixwe guhertoya nûtirîn e.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "lê %s dê were sazkirin"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "%s venebû"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -822,7 +818,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr ""
@@ -912,37 +908,37 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr "Nikare bi %s re girêdan pêk bîne %s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Di xebitandina apt-key de çewtiya nenas"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -952,31 +948,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Dema li pelî dihate nivîsîn çewtî"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Dema li pelî dihate nivîsîn çewtî"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Hilbijartin neserketî"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:655
+#: methods/http.cc:657
#, fuzzy
msgid "Error writing to output file"
msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
@@ -985,53 +981,293 @@ msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
msgid "Waiting for headers"
msgstr ""
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr ""
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr ""
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr ""
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Girêdan pêk nehatiye"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Çewtiya hundirîn"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Bindestî tên serrastkirin..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " neserketî."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Nikare bindestiyan rast kirin"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Temam"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr ""
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Sazkirî]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Sazkirî]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Sazkirî]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Sazkirî]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "lê %s sazkirî ye"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "lê %s dê were sazkirin"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "lê sazkirina wê ne gengaz e"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "lê paketeke farazî ye"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "lê ne sazkirî ye"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "lê dê neyê sazkirin"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " û"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Ev pakêtên NÛ dê werine sazkirin:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Ev pakêt dê werine RAKIRIN:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr ""
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Ev paket dê werine bilindkirin:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr ""
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr ""
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (ji ber %s)"
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin."
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu ji nû ve sazkirî,"
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu hatine nizmkirin."
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+#, fuzzy
+msgid "[Y/n]"
+msgstr "[E/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "E"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr ""
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1269,246 +1505,6 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr ""
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Bindestî tên serrastkirin..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " neserketî."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Nikare bindestiyan rast kirin"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Temam"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr ""
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Sazkirî]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Sazkirî]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Sazkirî]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Sazkirî]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "lê %s sazkirî ye"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "lê %s dê were sazkirin"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "lê sazkirina wê ne gengaz e"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "lê paketeke farazî ye"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "lê ne sazkirî ye"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "lê dê neyê sazkirin"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " û"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Ev pakêtên NÛ dê werine sazkirin:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Ev pakêt dê werine RAKIRIN:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr ""
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Ev paket dê werine bilindkirin:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr ""
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (ji ber %s)"
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin."
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu ji nû ve sazkirî,"
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu hatine nizmkirin."
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-#, fuzzy
-msgid "[Y/n]"
-msgstr "[E/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "E"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr ""
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1562,20 +1558,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
+#, c-format
+msgid "Hit:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Anîn:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Anîn:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
+#, c-format
+msgid "Ign:%lu %s"
msgstr ""
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Çewt"
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Çewt:%lu %s"
#: apt-private/acqprogress.cc:150
#, fuzzy, c-format
@@ -1598,17 +1598,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Nikare %s bixwîne"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1680,7 +1680,7 @@ msgstr ""
msgid "Merging available information"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1694,46 +1694,46 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Nivîsandin ji bo %s ne pêkane"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Nivîsandin ji bo %s ne pêkane"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Guhertoya debconf nehate stendin. debconf sazkirî ye?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Lîsteya dirêjahiya pakêtê zêde dirêj e"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Di şixulandina pêrista %s de çewtî"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Dema şixulandina naveroka %s çewtî"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1775,11 +1775,11 @@ msgid ""
" -o=? Set an arbitrary configuration option"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, 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"
@@ -1889,22 +1889,22 @@ msgstr ""
msgid "Archive had no package field"
msgstr "Di arşîvê de qada pakêtê tuneye"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -1990,7 +1990,7 @@ msgstr ""
msgid "Failed to rename %s to %s"
msgstr ""
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2017,11 +2017,11 @@ msgstr ""
" -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar bike. "
"mînak -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr ""
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2083,6 +2083,26 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Hash Sum li hev nayên"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:485
+#, 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/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2095,174 +2115,295 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr ""
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr ""
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr ""
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr ""
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr ""
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr ""
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr ""
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Bindest"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "PêşBindest"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Pêşniyaz dike"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Tawsiye dike"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Nakokî"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Dikeve şunve"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Kevin dike"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Dişkîne"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "girîng"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "pêwist"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "opsiyonel"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "ekstra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Bilindkirin tê hesibandin"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
+msgid "Index file type '%s' is not supported"
msgstr ""
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, c-format
-msgid "Is the package %s installed?"
+msgid "Malformed stanza %u in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/acquire-worker.cc:485
-#, 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/sourcelist.cc:173
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Guhartoyên berendam"
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
msgstr ""
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Vekirina StateFile %s biserneket"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s tê vekirin"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr ""
+
+#: apt-pkg/clean.cc:64
#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s ji hev nehate veçirandin"
+msgid "Unable to stat %s."
+msgstr "Nivîsandin ji bo %s ne pêkane"
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr ""
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Dema şixulandina naveroka %s çewtî"
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:591
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Lîsteya pakêtan tê xwendin"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "nav guherandin biserneket, %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Hash Sum li hev nayên"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Mezinahî li hev nayên"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
msgid "Invalid file format"
msgstr ""
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Çewtiya nivîsînê"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2270,7 +2411,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
@@ -2286,170 +2427,102 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Pakêt nehate dîtin %s"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, 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:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr ""
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Dema şixulandina naveroka %s çewtî"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Lîsteya pakêtan tê xwendin"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr ""
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Peldanka '%s' kêm e"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Peldanka '%s' kêm e"
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, c-format
-msgid "Clean of %s is not supported"
-msgstr ""
+#: apt-pkg/acquire.cc:162
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "W: pelrêça %s nayê xwendin\n"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Pel tê anîn %li ji %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
-#: apt-pkg/clean.cc:64
-#, fuzzy, c-format
-msgid "Unable to stat %s."
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2471,19 +2544,19 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "Nikarî pelê %s veke"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2491,9 +2564,10 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
msgstr ""
#: apt-pkg/cdrom.cc:571
@@ -2561,11 +2635,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Lîsteyên pakêtan tên jibergirtin..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr ""
@@ -2575,146 +2649,47 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
msgstr ""
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Guhartoyên berendam"
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
msgstr ""
-#: apt-pkg/tagfile.cc:169
-#, fuzzy, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Pakêt nehate dîtin %s"
-
-#: apt-pkg/tagfile.cc:269
-#, fuzzy, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Pakêt nehate dîtin %s"
-
-#: apt-pkg/indexrecords.cc:83
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Pakêt nehate dîtin %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
msgstr ""
-#: apt-pkg/indexrecords.cc:139
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
+msgid "Failed to open StateFile %s"
+msgstr "Vekirina StateFile %s biserneket"
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+#: apt-pkg/depcache.cc:258
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s ji hev nehate veçirandin"
-#: apt-pkg/indexrecords.cc:171
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
+msgid "Unable to parse package file %s (%d)"
msgstr "Pakêt nehate dîtin %s"
-#: apt-pkg/sourcelist.cc:127
-#, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "%s tê vekirin"
-
-#: apt-pkg/sourcelist.cc:371
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:375
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:416
-#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr ""
-
#: apt-pkg/cacheset.cc:501
#, c-format
msgid "Release '%s' for '%s' was not found"
@@ -2725,208 +2700,101 @@ msgstr ""
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Peywira %s nehate dîtin"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nikarî pakêta %s bibîne"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Nikarî pakêta %s bibîne"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "%s hatine sazkirin"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "%s tê mîhengkirin"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "%s tê rakirin"
-
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/indexrecords.cc:83
#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "%s bi tevahî hatine rakirin"
+msgid "Unable to parse Release file %s"
+msgstr "Pakêt nehate dîtin %s"
-#: apt-pkg/deb/dpkgpm.cc:111
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Noting disappearance of %s"
+msgid "No sections in Release file %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:112
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Running post-installation trigger %s"
+msgid "No Hash entry in Release file %s"
msgstr ""
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Directory '%s' missing"
-msgstr "Peldanka '%s' kêm e"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/indexrecords.cc:164
#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Nikarî pelê %s veke"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "%s tê amadekirin"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "%s tê derxistin"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "Mîhengkirina %s tê amadekirin"
-
-#: apt-pkg/deb/dpkgpm.cc:1012
-#, c-format
-msgid "Installed %s"
-msgstr "%s hatine sazkirin"
-
-#: apt-pkg/deb/dpkgpm.cc:1017
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Rakirina %s tê amadekirin"
-
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, c-format
-msgid "Removed %s"
-msgstr "%s hatine rakirin"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Bi tevahî rakirina %s tê amadekirin"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Pakêt nehate dîtin %s"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Completely removed %s"
-msgstr "%s bi tevahî hatine rakirin"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Nivîsandin ji bo %s ne pêkane"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
+#, c-format
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Pelrêça daxistinê nayê quflekirin"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "%lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
+msgstr "Hilbijartina %s nehatiye dîtin"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3061,35 +2929,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Çêbû"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Hilbijartina %s nehatiye dîtin"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr ""
@@ -3152,107 +2991,263 @@ msgstr "Nivîsandin ji bo %s ne pêkane"
msgid "Failed to stat the cdrom"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Opsiyona '%s' zêde dirêj e"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:112
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "%s hatine sazkirin"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "%s tê mîhengkirin"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "%s tê rakirin"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "%s bi tevahî hatine rakirin"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Peldanka '%s' kêm e"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Nikarî pelê %s veke"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "%s tê amadekirin"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "%s tê derxistin"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Mîhengkirina %s tê amadekirin"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "%s hatine sazkirin"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Rakirina %s tê amadekirin"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "%s hatine rakirin"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Bi tevahî rakirina %s tê amadekirin"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s bi tevahî hatine rakirin"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Nivîsandin ji bo %s ne pêkane"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Pelrêça daxistinê nayê quflekirin"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr ""
@@ -3359,7 +3354,7 @@ msgstr ""
msgid "Internal error, could not locate member %s"
msgstr ""
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr ""
@@ -3388,24 +3383,24 @@ msgstr "Arşîv zêde kin e"
msgid "Failed to read the archive headers"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
#, fuzzy
msgid "Failed to create pipes"
msgstr "%s ji hev nehate veçirandin"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Xebitandina gzip biserneket"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr ""
diff --git a/po/lt.po b/po/lt.po
index b910a16b8..1f485b28d 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2008-08-02 01:47-0400\n"
"Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -25,147 +25,147 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Paketas %s versijos numeriu %s turi netenkinamą priklausomybę:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
#, fuzzy
msgid "Total package names: "
msgstr "Visi paketų pavadinimai: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid "Total package structures: "
msgstr "Visi paketų pavadinimai: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Normalūs paketai: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Virtualūs paketai: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Pavieniai virtualūs paketai: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Mišrūs virtualūs paketai: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Trūksta: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Viso skirtingų versijų: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
#, fuzzy
msgid "Total distinct descriptions: "
msgstr "Viso skirtingų aprašymų: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Viso priklausomybių: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Viso versijų/failų santykių yra: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Viso aprašymų/failų santykių yra: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr ""
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr ""
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr ""
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr ""
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Paketų nerasta"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr ""
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Nepavyko rasti paketo %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Paketų failai:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Surišti paketai:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(nerasta)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Įdiegta: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Kandidatas: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(nėra)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Paketo susiejimai: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Versijų lentelė:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -202,20 +202,20 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
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:139
+#: cmdline/apt-cdrom.cc:140
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Nepavyko pervadinti %s į %s"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -223,7 +223,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Pakartokite šitą procesą su kitais CD savo rinkinyje."
@@ -259,83 +259,78 @@ msgstr ""
" -c=? Nuskaityti pateiktą konfigūracijos failą\n"
" -o=? Nurodyti tam tikrą konfigūracijos parametrą, pvz -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Nepavyko rasti paketo %s"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Nepavyko rasti paketo %s"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Nepavyko rasti paketo %s"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Nepavyko rasti paketo %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Vidinė klaida, problemos sprendimas kažką sugadino"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Nepavyko užrakinti sąrašo aplanko"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Nepavyko užrakinti parsiuntimų aplanko"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
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:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nepavyko surasti išeities teksto paketo, skirto %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -343,94 +338,94 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Reikia parsiųsti %sB išeities archyvų.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Parsiunčiamas archyvas %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Nepavyko gauti kai kurių arhcyvų."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Pavyko parsiųsti tik parsiuntimo režime"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, 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:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Klaida procese-palikuonyje"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
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:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -438,7 +433,7 @@ msgid ""
msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -446,14 +441,14 @@ msgid ""
msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, 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:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -462,7 +457,7 @@ msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos "
"versijos %s paketo"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -470,17 +465,17 @@ msgid ""
msgstr ""
"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Nepavyko patenkinti %s priklausomybės %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr ""
@@ -548,11 +543,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -566,52 +561,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "bet jis nėra įdiegtas"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s ir taip jau yra naujausias.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s ir taip jau yra naujausias.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "Nepavyko atverti %s"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -828,7 +824,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr ""
@@ -917,36 +913,36 @@ msgstr ""
msgid "Unable to connect to %s:%s:"
msgstr "Nepavyko prisijungti prie %s %s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Nežinoma klaida kviečiant apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Šie parašai buvo nevalidūs:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -956,31 +952,31 @@ msgstr "Šių parašų nebuvo galima patikrinti, nes nėra viešojo rakto:\n"
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Klaida bandant rašyti į failą"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr ""
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Prisijungimo laiko limitas baigėsi"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr ""
@@ -988,53 +984,295 @@ msgstr ""
msgid "Waiting for headers"
msgstr "Laukiama antraščių"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr ""
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr ""
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr ""
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Prisijungti nepavyko"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Vidinė klaida"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Taisomos priklausomybės..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " nepavyko."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Nepavyko patenkinti priklausomybių"
+
+#: apt-private/private-cachefile.cc:104
+#, fuzzy
+msgid "Unable to minimize the upgrade set"
+msgstr "Nepavyko minimizuoti atnaujinimo rinkinio"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Įvykdyta"
+
+#: apt-private/private-cachefile.cc:110
+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."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nepatenkintos priklausomybės. Bandykit naudoti -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Įdiegtas]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Įdiegtas]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Įdiegtas]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Įdiegtas]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "bet %s yra įdiegtas"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "bet %s bus įdiegtas"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "tačiau jis negali būti įdiegtas"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "bet tai yra virtualus paketas"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "bet jis nėra įdiegtas"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "bet jis nebus įdiegtas"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " arba"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Šie paketai turi neįdiegtų priklausomybių:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Bus įdiegti šie NAUJI paketai:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Bus PAŠALINTI šie paketai:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Šių paketų atnaujinimas sulaikomas:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Bus atnaujinti šie paketai:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Bus PAKEISTI SENESNIAIS šie paketai:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Bus pakeisti šie sulaikyti paketai:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (dėl %s) "
+
+#: apt-private/private-output.cc:696
+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!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu atnaujinti, %lu naujai įdiegti, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu įdiegti iš naujo, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu pasendinti, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[T/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[t/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "T"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Atnaujinimo komandai argumentų nereikia"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1286,248 +1524,6 @@ msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Taisomos priklausomybės..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " nepavyko."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Nepavyko patenkinti priklausomybių"
-
-#: apt-private/private-cachefile.cc:104
-#, fuzzy
-msgid "Unable to minimize the upgrade set"
-msgstr "Nepavyko minimizuoti atnaujinimo rinkinio"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Įvykdyta"
-
-#: apt-private/private-cachefile.cc:110
-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."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nepatenkintos priklausomybės. Bandykit naudoti -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Įdiegtas]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Įdiegtas]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Įdiegtas]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Įdiegtas]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "bet %s yra įdiegtas"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "bet %s bus įdiegtas"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "tačiau jis negali būti įdiegtas"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "bet tai yra virtualus paketas"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "bet jis nėra įdiegtas"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "bet jis nebus įdiegtas"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " arba"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Šie paketai turi neįdiegtų priklausomybių:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Bus įdiegti šie NAUJI paketai:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Bus PAŠALINTI šie paketai:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Šių paketų atnaujinimas sulaikomas:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Bus atnaujinti šie paketai:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Bus PAKEISTI SENESNIAIS šie paketai:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Bus pakeisti šie sulaikyti paketai:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (dėl %s) "
-
-#: apt-private/private-output.cc:696
-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!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu atnaujinti, %lu naujai įdiegti, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu įdiegti iš naujo, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu pasendinti, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu bus pašalinta ir %lu neatnaujinta.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[T/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[t/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "T"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Atnaujinimo komandai argumentų nereikia"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1581,20 +1577,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Imamas "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Imamas:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Gauti:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Gauti:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ignoruotas "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ignoruotas:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Klaida "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Klaida:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1620,17 +1620,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Nepavyko perskaityti %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1708,7 +1708,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Sujungiama turima informaija"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1733,46 +1733,46 @@ msgstr ""
" -c=? Nuskaityti šį konfigūracijų failą\n"
" -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Nepavyko sukurti %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Nepavyko įrašyti į %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nepavyko sužinoti debconf versijos. Ar įdiegtas debconf?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Paketo plėtinių sąrašas yra per ilgas"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Klaida apdorojant aplanką %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Šaltinio plėtinys yra per ilgas"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Klaida įrašant antraštę į turinio failą"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Klaida apdorojant turinį %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1858,11 +1858,11 @@ msgstr ""
" -c=? Perskaityti šį nuostatų failą\n"
" -o=? Nustatyti savarankišką konfigūracijos nuostatą"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Nėra atitikmenų"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Kai kurių failų nėra paketų grupėje „%s“"
@@ -1975,22 +1975,22 @@ msgstr ""
msgid "Archive had no package field"
msgstr "Archyvas neturėjo paketo lauko"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s neturi perrašymo įrašo\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, 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:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr ""
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
@@ -2076,7 +2076,7 @@ msgstr ""
msgid "Failed to rename %s to %s"
msgstr "Nepavyko pervadinti %s į %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2102,11 +2102,11 @@ msgstr ""
" -c=? Nuskaityti šį konfigūracijų failą\n"
" -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Nežinomas paketo įrašas!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2179,6 +2179,26 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Maišos sumos nesutapimas"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:485
+#, 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/cachefile.cc:94
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."
@@ -2193,175 +2213,296 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "Nepavyko perskaityti šaltinių sąrašo."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr ""
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr ""
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr ""
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr ""
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr ""
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr ""
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Priklauso"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Priešpriklauso"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Siūlo"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Rekomenduoja"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Konfliktuoja"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Pakeičia"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Pakeičia"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Sugadina"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "Svarbu"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "privaloma"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "standartinis"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "nebūtinas"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "papildomas"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Skaičiuojami atnaujinimai"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
+msgid "Index file type '%s' is not supported"
msgstr ""
-#: apt-pkg/acquire-worker.cc:135
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n"
+#: apt-pkg/sourcelist.cc:127
+#, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr ""
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, 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."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Konstruojamas priklausomybių medis"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Galimos versijos"
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Priklausomybių generavimas"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr ""
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Skaitoma būsenos informacija"
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr ""
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Failed to open StateFile %s"
+msgid "Malformed line %lu in source list %s (URI parse)"
msgstr ""
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:217
#, c-format
-msgid "Failed to write temporary StateFile %s"
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Atveriama %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr ""
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr ""
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Klaida apdorojant turinį %s"
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:591
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Skaitomi paketų sąrašai"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Maišos sumos nesutapimas"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Neatitinka dydžiai"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Klaidingas veiksmas %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Rašymo klaida"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2369,7 +2510,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG klaida: %s: %s"
@@ -2385,173 +2526,102 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nepavyko atverti DB failo %s: %s"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, 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:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr ""
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Klaida apdorojant turinį %s"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Skaitomi paketų sąrašai"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr ""
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Trūksta aplanko „%s“"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Trūksta aplanko „%s“"
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, c-format
-msgid "Clean of %s is not supported"
-msgstr ""
+#: apt-pkg/acquire.cc:162
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Nepavyko užrakinti sąrašo aplanko"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Parsiunčiamas %li failas iš %li (liko %s)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Parsiunčiamas %li failas iš %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-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/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2573,19 +2643,19 @@ msgstr ""
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "Nepavyko atverti failo %s"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2593,10 +2663,14 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+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/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2663,11 +2737,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Kopijuojami paketų sąrašai..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Rašomas naujas šaltinių sąrašas\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr ""
@@ -2677,144 +2751,45 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:83
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nepavyko atverti DB failo %s: %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Pastaba: pažymimas %s vietoje %s\n"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:152
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Pastaba: pažymimas %s vietoje %s\n"
-
-#: apt-pkg/indexrecords.cc:171
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Nepavyko atverti DB failo %s: %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr ""
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Konstruojamas priklausomybių medis"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Galimos versijos"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Priklausomybių generavimas"
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Atveriama %s"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Skaitoma būsenos informacija"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Malformed line %u in source list %s (type)"
+msgid "Failed to open StateFile %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Failed to write temporary StateFile %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid "Unable to parse package file %s (%d)"
msgstr ""
#: apt-pkg/cacheset.cc:501
@@ -2827,207 +2802,100 @@ msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“"
msgid "Version '%s' for '%s' was not found"
msgstr "Nebuvo rasta „%s“ versija paketui „%s“"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Nepavyko rasti užduoties %s"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nepavyko rasti paketo %s"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Nepavyko rasti paketo %s"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
+#: apt-pkg/indexrecords.cc:83
#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "Įdiegta %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Konfigūruojamas %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Šalinamas %s"
+msgid "Unable to parse Release file %s"
+msgstr "Nepavyko atverti DB failo %s: %s"
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/indexrecords.cc:91
#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Visiškai pašalintas %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "No sections in Release file %s"
+msgstr "Pastaba: pažymimas %s vietoje %s\n"
-#: apt-pkg/deb/dpkgpm.cc:112
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Running post-installation trigger %s"
+msgid "No Hash entry in Release file %s"
msgstr ""
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Trūksta aplanko „%s“"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/indexrecords.cc:145
#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Nepavyko atverti failo %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Ruošiamas %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "Išpakuojamas %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "Ruošiamasi konfigūruoti %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1012
-#, c-format
-msgid "Installed %s"
-msgstr "Įdiegta %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1017
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Ruošiamasi %s pašalinimui"
-
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, c-format
-msgid "Removed %s"
-msgstr "Pašalintas %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Ruošiamasi visiškai pašalinti %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1025
-#, c-format
-msgid "Completely removed %s"
-msgstr "Visiškai pašalintas %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Pastaba: pažymimas %s vietoje %s\n"
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
+#: apt-pkg/indexrecords.cc:164
#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Nepavyko įrašyti į %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Nepavyko atverti DB failo %s: %s"
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
+#, c-format
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Nepavyko užrakinti sąrašo aplanko"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "%lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:196
@@ -3163,35 +3031,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Baigta"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr ""
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr ""
@@ -3254,107 +3093,263 @@ msgstr ""
msgid "Failed to stat the cdrom"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Parametrui %s reikia argumento."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr ""
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Klaidingas veiksmas %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "Įdiegta %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Konfigūruojamas %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Šalinamas %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Visiškai pašalintas %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Trūksta aplanko „%s“"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Nepavyko atverti failo %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Ruošiamas %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Išpakuojamas %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Ruošiamasi konfigūruoti %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "Įdiegta %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Ruošiamasi %s pašalinimui"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "Pašalintas %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Ruošiamasi visiškai pašalinti %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "Visiškai pašalintas %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Nepavyko įrašyti į %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nepavyko užrakinti sąrašo aplanko"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr ""
@@ -3459,7 +3454,7 @@ msgstr ""
msgid "Internal error, could not locate member %s"
msgstr "Vidinė klaida, nepavyko aptikti nario %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr ""
@@ -3488,23 +3483,23 @@ msgstr "Archyvas per trumpas"
msgid "Failed to read the archive headers"
msgstr "Nepavyko perskaityti archyvo antraščių"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr ""
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Sugadintas archyvas"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar kontrolinė suma klaidinga, archyvas sugadintas"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Nežinomas TAR antraštės tipas %u. narys %s"
diff --git a/po/mr.po b/po/mr.po
index 98de1af6f..24e470cef 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2008-11-20 23:27+0530\n"
"Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
"Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -22,146 +22,146 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "पॅकेज %s आवृती %s मध्ये एक अनोळखी डीईपी:आहे\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "पॅकेजची सर्व नांवे: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid "Total package structures: "
msgstr "पॅकेजची सर्व नांवे: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " सामान्य पॅकेजेस्: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " शुध्द आभासी पॅकेजेस्:"
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " एकमेव आभासी पॅकेजेस्:"
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr "मिश्रित आभासी पॅकेजेस्:"
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " हरवलेले/गहाळ: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "एकूण स्पष्ट आवृत्या: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "एकूण स्पष्ट विवरणे: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "एकूण निर्भरता:"
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "एकूण व्हीईआर/संचिका परस्पर संबंध:"
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "एकूण विव/संचिका परस्पर संबंध:"
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "एकूण मॅपींगस् तरतूद: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "एकूण एकत्रित अक्षरसंच:"
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "एकूण दुर्लक्षित अवकाश:"
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "हिशेबात घेतलेली एकूण अवकाश(जागा):"
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "पॅकेज संचिका %s सिंक्रोनाइज नाहीत"
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "पॅकेजेस सापडले नाहीत"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
#, fuzzy
msgid "You must give at least one search pattern"
msgstr "तुम्हाला फक्त एकच नमुना द्यावा लागेल"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "पॅकेज %s शोधण्यास असमर्थ आहे"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "पॅकेज संचिका:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "दृतिका सिंक नाही,पॅकेज संचिका क्ष-संदर्भ करता येत नाही"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "एकत्रित पॅकेजेस:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(मिळाले नाही)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr "अधिष्ठापित केले:"
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr "उमेदवार:"
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(कोणताच नाही)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr "पॅकेज (पिन):"
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr "आवृत्ती कोष्टक:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s हे %s करिता %s %s वर संग्रहित\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -234,21 +234,21 @@ msgstr ""
"-o=? एखादा अहेतूक संरचना पर्याय निर्धारित करा उदा --o dir::cache=/tmp\n"
"अधिक माहितीसाठी apt-cache(8) and apt.conf(5) ची मॅन्युअल पृष्ठे पहा \n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "या तबकडीला कृपया नाव द्या जसे डेबियन २ एलआरएल तबकडी १"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "कृपया तबकडी ड्राईव्हमध्ये ठेवून एंटर दाबा"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ "
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -256,7 +256,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "तुमच्या संचामधील सर्व सीडीजसाठी याच कृतीची पुनरावृत्ती करा(हीच कृती करा)"
@@ -292,83 +292,78 @@ msgstr ""
" -c= ? ही संरचना संचिका वाचा \n"
" -o=? एखदा अहेतुक संरचना पर्याय निर्धारित करा, उदा।eg -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "%s पॅकेज सापडू शकले नाही"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "%s पॅकेज सापडू शकले नाही"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "%s पॅकेज सापडू शकले नाही"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "%s पॅकेज सापडू शकले नाही"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -376,113 +371,113 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "%s उगम घ्या\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "काही अर्काईव्हज आणण्यास असमर्थ."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "चाईल्ड प्रक्रिया अयशस्वी"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ "
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, 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:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -491,24 +486,24 @@ msgstr ""
"आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s "
"डिपेंडन्सी पूर्ण होऊ शकत नाही"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ "
@@ -617,11 +612,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -635,52 +630,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "पण ते संस्थापित केले नाही"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "%s उघडण्यास असमर्थ"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -901,7 +897,7 @@ msgstr "डेटा सॉकेट जोडणी वेळेअभावी
msgid "Unable to accept connection"
msgstr "जोडणी स्विकारण्यास असमर्थ"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "फाईल हॅश करण्यात त्रुटी"
@@ -990,39 +986,38 @@ msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना क
msgid "Unable to connect to %s:%s:"
msgstr "%s %s ला जोडण्यास असमर्थ:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "किमान एक अवैध सही सापडली."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
#, fuzzy
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
-"सहीची खात्री करण्यासाठी 'apt-key' कार्यान्वित करू शकत नाही (gnupg संस्थापित केले आहे "
-"का?)"
+"सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gnupg संस्थापित केले आहे का?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "apt-key कार्यान्वित होत असताना अपरिचित त्रुटी"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "खालील सह्या अवैध आहेत:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1032,31 +1027,31 @@ msgstr "खालील सह्यांची खात्री करता
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "सर्व्हर मधून वाचण्यात चूक"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "चुकले/असमर्थ निवड करा"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "जोडणी वेळेअभावी तुटली"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक"
@@ -1064,53 +1059,294 @@ msgstr "निर्गत फाईल मध्ये लिहिताना
msgid "Waiting for headers"
msgstr "शीर्षकासाठी थांबले आहे...."
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "वाईट शीर्षक ओळ"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP सर्व्हरने अवैध प्रत्त्युत्तर शीर्षक पाठविले"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP सर्व्हरने अवैध मजकूर-लांबी शीर्षक पाठविले "
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP सर्व्हरने अवैध मजकूर-विस्तार शीर्षक पाठविले"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "HTTP सर्व्हरने विस्तार तांत्रिक मदत जोडली"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "अपरिचित दिनांक प्रकार/स्वरूप "
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "चुकीचा शीर्षक डाटा"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "जोडणी अयशस्वी"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "अंतर्गत त्रुटी"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr "अयशस्वी/चूकीचे झाले."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे "
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr "झाले"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा "
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[संस्थापित केले]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr "[संस्थापित केले]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr "[संस्थापित केले]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr "[संस्थापित केले]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "पण %s संस्थापित झाले"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "पण %s संस्थापित करायचे आहे"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "पण ते संस्थापित करण्याजोगे नाही"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "पण ते आभासी पॅकेज आहे"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "पण ते संस्थापित केले नाही"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "पण ते संस्थापित होणार नाही"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr "किंवा"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "खालील नविन पॅकेजेस संस्थापित होतील:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "खालील पॅकेजेस परत ठेवली गेली:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (च्या मुळे %s)"
+
+#: apt-private/private-output.cc:696
+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"
+"तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले,"
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu पुनर्संस्थापित केले,"
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu मागील आवृत्तीकृत केले,"
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "होय"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही."
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "अंतर्गत त्रुटी, तुटलेल्या पॅकेजेस बरोबर संस्थापित पॅकेजला आवाहन केले गेले/बोलावले गेले!"
@@ -1366,247 +1602,6 @@ msgstr "%s पॅकेज संस्थापित केलेले ना
msgid "Package '%s' is not installed, so not removed\n"
msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "डिपेन्डन्सीज बरोबर/दुरूस्त करत आहे..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr "अयशस्वी/चूकीचे झाले."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे "
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "आवृत्तीकृत संच कमीतकमी करण्यास असमर्थ"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr "झाले"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "हे बरोबर करण्यासाठी तुम्हाला `apt-get -f संस्थापना' प्रोग्राम चालू करावा लागेल."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा "
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[संस्थापित केले]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr "[संस्थापित केले]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr "[संस्थापित केले]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr "[संस्थापित केले]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "पण %s संस्थापित झाले"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "पण %s संस्थापित करायचे आहे"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "पण ते संस्थापित करण्याजोगे नाही"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "पण ते आभासी पॅकेज आहे"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "पण ते संस्थापित केले नाही"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "पण ते संस्थापित होणार नाही"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr "किंवा"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "खालील पॅकेजेस मध्ये नमिळणाऱ्या निर्भरता/ डिपेन्डन्सीज आहेत:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "खालील नविन पॅकेजेस संस्थापित होतील:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "खालील नविन पॅकेजेस कायमची काढून टाकली जातील:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "खालील पॅकेजेस परत ठेवली गेली:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "खालील पॅकेजेस पुढिल आवृत्तीकृत होतील:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "खालील पॅकेजेस पुढच्या आवृत्तीकृत होणार नाहीत:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "पुढिल ठेवलेली पॅकेजेस बदलतील:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (च्या मुळे %s)"
-
-#: apt-private/private-output.cc:696
-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"
-"तुम्हाला तुम्ही काय करत आहात हे कळेपर्यंत असं करता येणार नाही!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले,"
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu पुनर्संस्थापित केले,"
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu मागील आवृत्तीकृत केले,"
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu कायमचे काढून टाकण्यासाठी आणि %lu पुढच्या आवृत्तीकृत झालेली नाही.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "होय"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही."
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1661,20 +1656,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "दाबा"
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "दाबा:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "मिळवा:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "मिळवा:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "आय.जी.एन."
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "आय.जी.एन.:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "दोष इ.आर.आर."
+#, c-format
+msgid "Err:%lu %s"
+msgstr "दोष इ.आर.आर.:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1700,17 +1699,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "%s वाचण्यास असमर्थ"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1785,7 +1784,7 @@ msgstr ""
msgid "Merging available information"
msgstr "उपलब्ध माहितीचे एकत्रीकरण करत आहे"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1809,46 +1808,46 @@ msgstr ""
" -c=? ही संरचना संचिका वाचा \n"
" -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "%s स्टॅट करण्यास असमर्थ"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "%s मध्ये लिहिण्यास असमर्थ "
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "debconf आवृत्ती मिळू शकत नाही,debconf अधिष्ठापित झाली काय?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "पॅकेजेसची विस्तारित यादी खूप मोठी आहे"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "त्रुटी प्रक्रिया मार्गदर्शिका%s "
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "उगमस्थानाची विस्तारित यादी खूप मोठी आहे"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "शीर्षक संचिकेमधून मजकूर संचिकेत लिहिण्यात त्रुटी"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "त्रुटी प्रक्रिया मजकूर %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1929,11 +1928,11 @@ msgstr ""
" -c=? ही संरचना संचिका वाचा \n"
" -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "निवडक भाग जुळत नाही"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "`%s' पॅकेज संचिका समुहातील काही संचिका गहाळ आहेत"
@@ -2046,22 +2045,22 @@ msgstr "%sB हीट ची डिलींक मर्यादा\n"
msgid "Archive had no package field"
msgstr "अर्काईव्ह ला पॅकेज जागा नाही"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n"
@@ -2147,7 +2146,7 @@ msgstr "%s दुवा मोकळा/सुटा करण्यास अ
msgid "Failed to rename %s to %s"
msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ "
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2172,11 +2171,11 @@ msgstr ""
" -c=? ही संरचना संचिका वाचा \n"
" -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "अनोळखी पॅकेज माहिती संच!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2249,6 +2248,26 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "हॅश बेरीज जुळत नाही"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. "
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "पॅकेजच्या याद्या किंवा संचिकेची स्थिती स्पष्ट होऊ शकत नाही किंवा ती उघडू शकत नाही."
@@ -2261,176 +2280,302 @@ msgstr "तुम्ही ह्या समस्यांचे निवा
msgid "The list of sources could not be read."
msgstr "उगमांच्या याद्या वाचता येणार नाहीत."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "पॅकेज अस्थाई स्मृतिकोष"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल खराब झाली आहे"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल ही विजोड आवृत्ती आहे"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल खराब झाली आहे"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "'%s' आवृत्तीकरण प्रणालीला हे APT तांत्रिक मदत देऊ शकत नाही"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "पॅकेज अस्थाई स्मृतीकोष वेगळ्या वास्तुविद्ये साठी बनवला गेला"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "अवलंबित"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "पूर्व अवलंबित"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "सुचवणे"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "शिफारस"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "परस्परविरोध"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "परत त्याठिकाणी आणा"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "अप्रचलित"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "तोडले"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "अत्यावश्यक"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "आवश्यक"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "मानक"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "एच्छिक"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "अधिक"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "पुढिल आवृत्तीची गणती करीत आहे"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. "
+msgid "Index file type '%s' is not supported"
+msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:206
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s कार्यपध्दती योग्य रीतीने सुरु झालेली नाही"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "स्त्रोत सुची %2$s (यूआरआय) मध्ये %1$lu वाईट/व्यंग रेषा"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:208
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "कृपया '%s' लेबल असलेली डिस्क '%s' या ड्राइव्हमध्ये ठेवा आणि एन्टर कळ दाबा."
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "स्त्रोत सुची %2$s (डिआयएसटी) मध्ये %1$lu वाईट/व्यंग रेषा"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "स्त्रोत सुची %2$s (यूआरआय पार्स) मध्ये %1$lu वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "स्त्रोत सुची %2$s (absolute dist) मध्ये %1$lu वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "स्त्रोत सुची %2$s (डीआयएसटी पार्स) मध्ये %1$lu वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s उघडत आहे"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "%2$s स्त्रोत सुचीमध्ये ओळ %1$u खूप लांब आहे."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "स्त्रोत सुची %2$s (प्रकार) मध्ये %1$u वाईट/व्यंग रेषा"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "अवलंबित रचना बांधणी करत आहे"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s स्टॅट करण्यात असमर्थ. "
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "कंॅडिडेट आवृत्त्या"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "अस्थायी स्मृतिकोष मध्ये विसंगत आवृतीकरण प्रणाली आहे"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "अवलंबित/विसंबून असलेले उत्पादन "
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "स्थिती माहिती वाचत आहे"
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही पॅकेज नांवांच्या संख्येची मर्यादा ओलांडली "
+"आहे."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही आवृत्त्या संख्येची मर्यादा ओलांडली आहे."
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "अरेवा!, तुम्ही तर ह्या ऍप्टच्या कार्यक्षमतेपेक्षाही विवरण संख्येची मर्यादा ओलांडली आहे."
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही अवलंबित/विसंबून असलेल्या संख्येची मर्यादा "
+"ओलांडली आहे."
+
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s StateFile उघडणे असफल"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही "
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल"
+msgid "Couldn't stat source package list %s"
+msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "पॅकेज याद्या वाचत आहोत"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "हॅश बेरीज जुळत नाही"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "आकार जुळतनाही"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "%s अवैध क्रिया"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "लिहिण्यात त्रुटी"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2438,7 +2583,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
@@ -2454,49 +2599,49 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2505,12 +2650,12 @@ msgstr ""
"मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते "
"स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) "
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2518,118 +2663,42 @@ msgstr ""
"पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/"
"ठिकाण %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "अस्थायी स्मृतिकोष मध्ये विसंगत आवृतीकरण प्रणाली आहे"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही पॅकेज नांवांच्या संख्येची मर्यादा ओलांडली "
-"आहे."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही आवृत्त्या संख्येची मर्यादा ओलांडली आहे."
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "अरेवा!, तुम्ही तर ह्या ऍप्टच्या कार्यक्षमतेपेक्षाही विवरण संख्येची मर्यादा ओलांडली आहे."
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"अरेवा!, तुम्ही तर ह्या एपिटीच्या कार्यक्षमतेपेक्षाही अवलंबित/विसंबून असलेल्या संख्येची मर्यादा "
-"ओलांडली आहे."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही "
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "पॅकेज याद्या वाचत आहोत"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "विक्रेता गट %s मध्ये बोटाचे ठसे नाहीत"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "संचयिका यादीत %s पार्शल हरवले आहे."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "ऑर्काइव्ह संचयिका %spartial गायब आहे."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "'%s' प्रकारची निर्देशक संचिका सहाय्यकारी नाही"
+msgid "Unable to lock directory %s"
+msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "%li ची %li(%s राहिलेले) संचिका पुन:प्राप्त करीत आहे"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "%li ची %li संचिका पुन:प्राप्त करीत आहे"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"काही अनुक्रमणिका संचयिका डाऊनलोड करण्यास असमर्थ,त्या दुर्लक्षित झाल्या, किंवा "
-"त्याऐवजी जुन्या वापरल्या गेल्या."
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "तुम्ही तुमच्या उगमस्थान यादीत URI घाला"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s स्टॅट करण्यात असमर्थ. "
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2651,19 +2720,19 @@ msgstr "%s पिनचा प्रकार समजलेला नाही
msgid "No priority (or zero) specified for pin"
msgstr "पिन करिता प्राधान्य/अग्रक्रम (किंवा शून्य)निर्देशीत केलेला नाही"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "%s फाईल उघडता येत नाही"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2674,10 +2743,14 @@ msgstr ""
"गुंतागुंतीमुळे/Pre-Depends पूर्व अवलंबित आवर्तन.हे नेहमीच वाईट असते, पण जर तुम्हाला ते खरोखर "
"करावयाचे असेल तर,APT::Force-LoopBreak पर्याय कार्यान्वित करा."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "%2$s स्त्रोत सुचीमध्ये ओळ %1$u खूप लांब आहे."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"काही अनुक्रमणिका संचयिका डाऊनलोड करण्यास असमर्थ,त्या दुर्लक्षित झाल्या, किंवा "
+"त्याऐवजी जुन्या वापरल्या गेल्या."
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2746,11 +2819,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "पॅकेज सूचींच्या प्रती तयार करित आहे..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "नविन स्त्रोत सूची लिहित आहे\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n"
@@ -2761,7 +2834,7 @@ msgid ""
msgstr ""
"%s पॅकेज पुनः:अधिष्ठापित करण्याची गरज आहे, परंतु मला त्यासाठी ऑर्काइव्ह सापडू शकले नाही."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2769,139 +2842,40 @@ msgstr ""
"दोष,पॅकेज समस्या निवारक::निवारण करतांना अडथळा निर्माण झाला, ह्याचे कारण स्थगित "
"पॅकेजेस असू शकते."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ"
-
-#: apt-pkg/indexrecords.cc:83
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-
-#: apt-pkg/indexrecords.cc:91
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:152
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
-
-#: apt-pkg/indexrecords.cc:171
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:170
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:173
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:190
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:193
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "स्त्रोत सुची %2$s (यूआरआय) मध्ये %1$lu वाईट/व्यंग रेषा"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "स्त्रोत सुची %2$s (डिआयएसटी) मध्ये %1$lu वाईट/व्यंग रेषा"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "अवलंबित रचना बांधणी करत आहे"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "स्त्रोत सुची %2$s (यूआरआय पार्स) मध्ये %1$lu वाईट/व्यंग रेषा"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "कंॅडिडेट आवृत्त्या"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "स्त्रोत सुची %2$s (absolute dist) मध्ये %1$lu वाईट/व्यंग रेषा"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "अवलंबित/विसंबून असलेले उत्पादन "
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "स्त्रोत सुची %2$s (डीआयएसटी पार्स) मध्ये %1$lu वाईट/व्यंग रेषा"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "स्थिती माहिती वाचत आहे"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "%s उघडत आहे"
+msgid "Failed to open StateFile %s"
+msgstr "%s StateFile उघडणे असफल"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "स्त्रोत सुची %2$s (प्रकार) मध्ये %1$u वाईट/व्यंग रेषा"
+msgid "Failed to write temporary StateFile %s"
+msgstr "%s तात्पुरत्या StateFile मध्ये लिहिणे असफल"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
-
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही "
+msgid "Unable to parse package file %s (%d)"
+msgstr "%s पॅकेज फाईल पार्स करण्यात असमर्थ (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2913,208 +2887,101 @@ msgstr "'%s' साठी '%s' आवृत्ती सापडली ना
msgid "Version '%s' for '%s' was not found"
msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "%s कार्य सापडू शकले नाही"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "%s पॅकेज सापडू शकले नाही"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "%s पॅकेज सापडू शकले नाही"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "%s संस्थापित होत आहे"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "%s संरचित होत आहे"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "%s काढून टाकत आहे"
+#: apt-pkg/indexrecords.cc:83
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/indexrecords.cc:91
#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "%s संपूर्ण काढून टाकले"
+msgid "No sections in Release file %s"
+msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
-#: apt-pkg/deb/dpkgpm.cc:111
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Noting disappearance of %s"
+msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "संस्थापना-पश्चात ट्रिगर %s चालवत आहे"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "'%s' संचयिका गहाळ आहे"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/indexrecords.cc:145
#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "%s फाईल उघडता येत नाही"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "%s तयार करित आहे"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "%s सुटे/मोकळे करीत आहे "
-
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "%s संरचने साठी तयार करत आहे"
-
-#: apt-pkg/deb/dpkgpm.cc:1012
-#, c-format
-msgid "Installed %s"
-msgstr "%s संस्थापित झाले"
-
-#: apt-pkg/deb/dpkgpm.cc:1017
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे"
-
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, c-format
-msgid "Removed %s"
-msgstr "%s काढून टाकले"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे"
-
-#: apt-pkg/deb/dpkgpm.cc:1025
-#, c-format
-msgid "Completely removed %s"
-msgstr "%s संपूर्ण काढून टाकले"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
+#: apt-pkg/indexrecords.cc:164
#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "%s मध्ये लिहिण्यास असमर्थ "
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
+#, c-format
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "%lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
+msgstr "%s निवडक भाग सापडत नाही"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3249,35 +3116,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... झाले"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "%s निवडक भाग सापडत नाही"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "रिकामी फाईल mmap करता येणार नाही"
@@ -3339,107 +3177,263 @@ msgstr "%s माऊंट पॉईंट स्टॅट करण्यास
msgid "Failed to stat the cdrom"
msgstr "सीडी-रॉम स्टॅट करण्यास असमर्थ"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "संक्षिप्तरुपाचा माहित नसलेला प्रकार: '%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "%s संरचना फाईल उघडत आहे"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "रचनेच्या नियमांचा दोष %s:%u: ब्लॉक नावाशिवाय सुरू होतो."
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "रचनेच्या नियमांचा दोष : %s:%u: मालफॉर्मड् टॅग"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "रचनेच्या नियमांचा दोष %s:%u: मुल्यांच्या नंतर अधिक जंक"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "रचनेच्या नियमांचा दोष %s:%u: दिशादर्शक फक्त उच्च पातळीवर केले जाऊ शकतात"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "रचनेच्या नियमांचा दोष %s:%u: खूपच एकात एक इनक्लूडस्"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "रचनेच्या नियमांचा दोष %s:%u: ह्या पासून समाविष्ट "
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "नियम रचनेचा दोष %s:%u: '%s' दिशादर्शक असहाय्यकारी"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, fuzzy, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "रचनेच्या नियमांचा दोष %s:%u: दिशादर्शक फक्त उच्च पातळीवर केले जाऊ शकतात"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "नियम रचनेचा दोष %s:%u: फाईलच्या अंती अधिक जंक"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "आदेश रेखा पर्याय '%c' [पासून %s] हे माहित नाही."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "आदेश रेखा पर्याय %s नीट समजला नाही"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "आदेश रेखा पर्याय %s हे बूलियन नाही"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "पर्याय %s साठी ऑर्गुमेंट पाहिजे"
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "पर्याय %s: संरचितेच्या यादीतील कलमांचा तपशीलाला असलेच पाहिजे ते =<मूल्य>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "%s पर्याय ला पूर्णांक ऑर्गुमेंट पाहिजे,'%s' नको"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "'%s' पर्याय खूप लांब आहे"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "%s संवेदना हे समजत नाही, चूक की बरोबर चा प्रयत्न करा."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "%s अवैध क्रिया"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "%s संस्थापित होत आहे"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "%s संरचित होत आहे"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "%s काढून टाकत आहे"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "%s संपूर्ण काढून टाकले"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "संस्थापना-पश्चात ट्रिगर %s चालवत आहे"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "'%s' संचयिका गहाळ आहे"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "%s फाईल उघडता येत नाही"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "%s तयार करित आहे"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "%s सुटे/मोकळे करीत आहे "
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "%s संरचने साठी तयार करत आहे"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "%s संस्थापित झाले"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "%s ला काढून टाकण्यासाठी तयारी करत आहे"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "%s काढून टाकले"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "%s संपूर्ण काढून टाकण्याची तयारी करत आहे"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s संपूर्ण काढून टाकले"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "%s मध्ये लिहिण्यास असमर्थ "
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "सुटा करण्यासाठी बोलावलेला/आणलेला सांधा(ड्रापनोड)अजुनही जुळलेलाच सांधा(लिंकनोड) आहे"
@@ -3544,7 +3538,7 @@ msgstr "हा वैध DEB अर्काईव्ह नाही,'%s' म
msgid "Internal error, could not locate member %s"
msgstr "अंतर्गत त्रुटी,%s मेंबर शोधू शकत नाही"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "अनपार्सेबल नियंत्रण फाईल"
@@ -3573,23 +3567,23 @@ msgstr "अर्काईव्ह खूप छोटे आहे"
msgid "Failed to read the archive headers"
msgstr "अर्काईव्ह शीर्षके वाचणे असफल"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "पाईप तयार करण्यास असमर्थ"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "exec gzip करण्यास असमर्थ"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "बिघडलेली अर्काईव्हज"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "टार(टेपअर्काईव्ह) चेकसम चुकला, बिघडलेली अर्काईव्ह"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "अपरिचित TAR शीर्षक प्रकार %u, मेंबर %s"
diff --git a/po/nb.po b/po/nb.po
index de3980320..433e33909 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2010-09-01 21:10+0200\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -27,145 +27,145 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Pakken %s versjon %s har et uinnfridd avhengighetsforhold:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Antall pakkenavn: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Antall pakkestrukturer: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Vanlige pakker: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Rent virtuelle pakker: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Enkle virtuelle pakker: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Sammensatte virtuelle pakker: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Mangler: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Antall unike versjoner: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Antall unike beskrivelser: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Antall avhengighetsforhold: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Antall forhold versjon/fil: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Antall forhold beskrivelse/fil: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Antall tilbudte tilknyttinger: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Antall utvidede strenger: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Plass brukt av slark: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Samlet mengde redegjort plass: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakkefila %s er ikke oppdatert."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Fant ingen pakker"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Du må oppgi minst ett søkemønster"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Klarer ikke å finne pakken %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Pakkefiler:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
"Mellomlageret er ikke oppdatert, kan ikke kryssreferere til en pakkefil"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Låste pakker:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(ikke funnet)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Installert: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Kandidat: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(ingen)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Pakke låst til: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Versjonstabell:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s for %s kompilert på %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -240,20 +240,20 @@ msgstr ""
" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
"Les manualsidene apt-cache(8) og apt.conf(5) for mer informasjon.\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Oppgi et navn for disken, for eksempel «Debian 5.0.3 Disk 1»"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Sett inn en disk i lagringsenheten og trykk Enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Klarte ikke montere «%s» på «%s»"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -261,7 +261,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Gjenta denne prosessen for resten av CD-ene i ditt sett."
@@ -297,76 +297,71 @@ msgstr ""
" -c=? Les denne innstillingsfila.\n"
" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Klarte ikke finne noen pakken med regex «%s»"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Klarte ikke finne noen pakken med regex «%s»"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Klarte ikke finne noen pakken med regex «%s»"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Velger «%s» som kildepakke istedenfor «%s»\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Ignorer utilgjengelig versjon «%s» av pakke «%s»"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Klarte ikke å finne pakken %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s satt til manuell installasjon.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s satt til automatisk installasjon.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil, problemløser ødela noe"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Klarte ikke låse mappa %s"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Klarer ikke å låse nedlastingsmappa"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
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:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Klarer ikke å finne en kildekodepakke for %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -375,7 +370,7 @@ msgstr ""
"MERK: «%s»-pakker blir vedlikeholdt i versjonskontrollsystemet «%s» på:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -386,115 +381,115 @@ msgstr ""
"bzr get %s\n"
"for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hopper over allerede nedlastet fil «%s»\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Skaffer kildekode %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Klarte ikke å skaffe alle arkivene."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, 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:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, 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:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggekommandoen «%s» mislyktes.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Barneprosessen mislyktes"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
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:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Klarte ikke å behandle forutsetningene for bygging"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, 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:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen avhengigheter.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, 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:1329
+#: cmdline/apt-get.cc:1320
#, 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:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -503,24 +498,24 @@ 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:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Klarte ikke å behandle forutsetningene for bygging"
@@ -631,11 +626,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Du må angi minst en pakke du vil ha kildekoden til"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -649,52 +644,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "men er ikke installert"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s satt til manuell installasjon.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s satt til automatisk installasjon.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s er allerede nyeste versjon.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s er allerede nyeste versjon.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ventet på %s, men den ble ikke funnet"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "%s satt til manuell installasjon.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "Klarte ikke å åpne %s"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -917,7 +913,7 @@ msgstr "Tidsavbrudd på tilkoblingen til datasokkelen"
msgid "Unable to accept connection"
msgstr "Klarte ikke å godta tilkoblingen"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nøkkel for fil"
@@ -1006,38 +1002,38 @@ msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Klarte ikke koble til %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "Intern feil: God signatur, men kunne bestemme nøkkelfingeravtrykk?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Minst en ugyldig signatur ble funnet."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"Klarte ikke kjøre «apt-key» for å verifisere signaturen (er gnupg "
"installert?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Ukjent feil ved kjøring av apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "De følgende signaturene var ugyldige:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1049,31 +1045,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Feil ved lesing fra tjeneren"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Utvalget mislykkes"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Tidsavbrudd på forbindelsen"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
@@ -1081,53 +1077,298 @@ msgstr "Feil ved skriving til utfil"
msgid "Waiting for headers"
msgstr "Venter på hoder"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Ødelagt hodelinje"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-tjeneren sendte et ugyldig «Content-Length»-hode"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-tjeneren sendte et ugyldig «Content-Range»-hode"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tjeneren har ødelagt støtte for område"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Ukjent datoformat"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Ødelagte hodedata"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Forbindelsen mislykkes"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Intern feil"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Retter på avhengighetsforhold ..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " mislyktes."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Klarer ikke å rette på avhengighetsforholdene"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Klarer ikke å minimere oppgraderingsettet"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Utført"
+
+#: apt-private/private-cachefile.cc:110
+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."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "men %s er installert"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s skal installeres"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "men lar seg ikke installere"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "men er en virtuell pakke"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "men er ikke installert"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "men skal ikke installeres"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " eller"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Følgende NYE pakker vil bli installert:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Følgende pakker vil bli FJERNET:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Følgende pakker er holdt tilbake:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Følgende pakker vil bli oppgradert:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Følgende pakker vil bli NEDGRADERT:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Følgende pakker vil bli endret:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (pga. %s) "
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu oppgraderte, %lu nylig installerte, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu installert på nytt, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu nedgraderte, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Kompileringsfeil i regulært uttrykk - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Oppdaterings-kommandoen tar ingen argumenter"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"MERK: Dette er kun en simulering.\n"
+" apt-get må ha root-rettigheter for reell utførelse.\n"
+" Husk også at låsing er deaktivert, så ikke regn med \n"
+" relevans i forhold til den reelle gjeldende situasjonen."
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
@@ -1390,251 +1631,6 @@ msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Retter på avhengighetsforhold ..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " mislyktes."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Klarer ikke å rette på avhengighetsforholdene"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Klarer ikke å minimere oppgraderingsettet"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Utført"
-
-#: apt-private/private-cachefile.cc:110
-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."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "men %s er installert"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "men %s skal installeres"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "men lar seg ikke installere"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "men er en virtuell pakke"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "men er ikke installert"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "men skal ikke installeres"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " eller"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Følgende NYE pakker vil bli installert:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Følgende pakker vil bli FJERNET:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Følgende pakker er holdt tilbake:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Følgende pakker vil bli oppgradert:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Følgende pakker vil bli NEDGRADERT:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Følgende pakker vil bli endret:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (pga. %s) "
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu oppgraderte, %lu nylig installerte, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu installert på nytt, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu nedgraderte, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Kompileringsfeil i regulært uttrykk - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Oppdaterings-kommandoen tar ingen argumenter"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"MERK: Dette er kun en simulering.\n"
-" apt-get må ha root-rettigheter for reell utførelse.\n"
-" Husk også at låsing er deaktivert, så ikke regn med \n"
-" relevans i forhold til den reelle gjeldende situasjonen."
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1688,20 +1684,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Funnet "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Funnet:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Hent:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Hent:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ign:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Feil "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Feil:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1727,17 +1727,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Klarer ikke å lese %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1812,7 +1812,7 @@ msgstr "av betydning. Sett dem i stand dem og kjør [I]nstall igjen."
msgid "Merging available information"
msgstr "Fletter tilgjengelig informasjon"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1837,46 +1837,46 @@ msgstr ""
" -c=? Les denne innstillingsfila.\n"
" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Klarte ikke å få statusen på %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Kan ikke skrive til %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Lista over pakkeutvidelser er for lang"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Feil ved lesing av katalogen %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Lista over kildeutvidelser er for lang"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Feil ved skriving av topptekst til innholdsfila"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Det oppsto en feil ved lesing av %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1958,11 +1958,11 @@ msgstr ""
" -c=? Les denne oppsettsfila.\n"
" -o=? Setter en vilkårlig innstilling"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Ingen utvalg passet"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Enkelte filer mangler i pakkegruppa «%s»"
@@ -2074,22 +2074,22 @@ msgstr " DeLink-grensa på %s B er nådd.\n"
msgid "Archive had no package field"
msgstr "Arkivet har ikke noe pakkefelt"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har ingen overstyringsoppføring\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-vedlikeholderen er %s, ikke %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen kildeoverstyringsoppføring\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har ingen binæroverstyringsoppføring heller\n"
@@ -2175,7 +2175,7 @@ msgstr "Problem ved oppheving av lenken til %s"
msgid "Failed to rename %s to %s"
msgstr "Klarte ikke å endre navnet på %s til %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2201,11 +2201,11 @@ msgstr ""
" -c=? Les denne innstillingsfila.\n"
" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Ukjent pakkeoppføring"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2277,6 +2277,26 @@ msgstr "Klarte ikke finne autentiseringsoppføring for: %s"
msgid "Hash mismatch for: %s"
msgstr "Hashsummen stemmer ikke for: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Finner ikke metode-driveren %s."
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startet ikke korrekt"
+
+#: apt-pkg/acquire-worker.cc:485
+#, 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/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "Pakkelista eller tilstandsfila kunne ikke fortolkes eller åpnes."
@@ -2290,176 +2310,297 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "Kan ikke lese kildlista."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Tomt pakkelager"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Pakkens lagerfil er ødelagt"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Pakkens lagerfil er av feil versjon (samvirker ikke)"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "Pakkens lagerfil er ødelagt"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Denne APT støtter ikke versjonssystemet «%s»"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Pakkelageret ble bygd for en annen arkitektur"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Avhenger av"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Forutsetter"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Foreslår"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Anbefaler"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Er i konflikt med"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Erstatter"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Nuller"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Ødelegger"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Forbedrer"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "viktig"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "påkrevet"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "vanlig"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "valgfri"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "tillegg"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Beregner oppgradering"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Finner ikke metode-driveren %s."
+msgid "Index file type '%s' is not supported"
+msgstr "Oversiktsfil av typen «%s» støttes ikke"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startet ikke korrekt"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Feil på linje %lu i kildelista %s ([valg] ikke tolkbar)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, 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."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Feil på linje %lu i kildelista %s ([valg] for kort)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Feil på linje %lu i kildelista %s ([%s] er ingen tilordning)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Feil på linje %lu i kildelista %s ([%s] har ingen nøkkel)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Feil på linje %lu i kildelista %s ([%s] nøkkel %s har ingen verdi)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Feil på linje %lu i kildelista %s (nettadresse)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Feil på linje %lu i kildelista %s (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, 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:217
+#, 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:224
+#, 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:335
+#, c-format
+msgid "Opening %s"
+msgstr "Åpner %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Linje %u i kildelista %s er for lang"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Feil på %u i kildelista %s (type)"
+
+#: apt-pkg/sourcelist.cc:375
+#, 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:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "Oversiktsfil av typen «%s» støttes ikke"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Skaper oversikt over avhengighetsforhold"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Klarer ikke finne informasjonom %s."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versjons-kandidater"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Lageret har et uoverensstemmende versjonssystem"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Oppretter avhengighetsforhold"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Feil oppsto under behandling av %s (FindPkg)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Leser tilstandsinformasjon"
+#: apt-pkg/pkgcachegen.cc:273
+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:276
+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/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:279
+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:282
+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:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Klarte ikke å åpne StateFile %s"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Fant ikke pakken %s %s ved behandling av filkrav"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Klarte ikke å skrive midlertidig StateFile %s"
+msgid "Couldn't stat source package list %s"
+msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Leser pakkelister"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Samler inn filtilbud"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "IO-feil ved lagring av kildekode-lager"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "klarte ikke å endre navnet, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Hashsummen stemmer ikke"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Feil størrelse"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Ugyldig operasjon %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Skrivefeil"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2469,7 +2610,7 @@ msgstr ""
"forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-feil: %s: %s"
@@ -2485,50 +2626,50 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Klarer ikke å fortolke Release-fila %s"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
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:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2537,125 +2678,54 @@ 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:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, 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/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Lageret har et uoverensstemmende versjonssystem"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Feil oppsto under behandling av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:273
-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:276
-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:279
-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:282
-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:591
-#, 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:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Leser pakkelister"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Samler inn filtilbud"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "IO-feil ved lagring av kildekode-lager"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Utgivers blokk %s inneholder ikke no fingeravtrykk"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Listemappa %spartial mangler."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Arkivmappa %spartial mangler."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Oversiktsfil av typen «%s» støttes ikke"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "Klarte ikke låse mappa %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Henter fil %li av %li (%s gjenværende)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Henter fil %li av %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-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/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
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/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Klarer ikke finne informasjonom %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2677,7 +2747,7 @@ msgstr "Forsto ikke spikring av typen %s"
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller null) spesifisert for pin"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2686,12 +2756,12 @@ msgstr ""
"Klarte ikke gjennomføre umiddelbar konfigurasjon av «%s». Se man 5 apt.conf "
"under APT::Immediate-Configure for detaljer. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "Klarte ikke åpne fila «%s»"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2702,10 +2772,14 @@ 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/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linje %u i kildelista %s er for lang"
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+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/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2776,11 +2850,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Kopierer pakkelister..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Skriver ny kildeliste\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Kildelisteoppføringer for denne CD-en er:\n"
@@ -2791,7 +2865,7 @@ msgid ""
msgstr ""
"Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2799,139 +2873,40 @@ msgstr ""
"Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker "
"som holdes tilbake."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Klarer ikke å fortolke pakkefila %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Klarer ikke å fortolke pakkefila %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Klarer ikke å fortolke Release-fila %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Ingen avsnitt i Release-fila %s"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ingen sjekksumoppføring i Release-fila %s"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ugyldig «Valid-Until»-oppføring i Release-fila %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ugyldig «Date»-oppføring i Release-fila %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Feil på linje %lu i kildelista %s ([valg] ikke tolkbar)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Feil på linje %lu i kildelista %s ([valg] for kort)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Feil på linje %lu i kildelista %s ([%s] er ingen tilordning)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Feil på linje %lu i kildelista %s ([%s] har ingen nøkkel)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Feil på linje %lu i kildelista %s ([%s] nøkkel %s har ingen verdi)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Feil på linje %lu i kildelista %s (nettadresse)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Feil på linje %lu i kildelista %s (dist)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Skaper oversikt over avhengighetsforhold"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versjons-kandidater"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Feil på %lu i kildelista %s (Absolutt dist)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Oppretter avhengighetsforhold"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Feil på %lu i kildelista %s (dist fortolking)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Leser tilstandsinformasjon"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "Åpner %s"
+msgid "Failed to open StateFile %s"
+msgstr "Klarte ikke å åpne StateFile %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Feil på %u i kildelista %s (type)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikke å skrive midlertidig StateFile %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, 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:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Klarer ikke å fortolke pakkefila %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2943,47 +2918,47 @@ msgstr "Utgave «%s» av «%s» ble ikke funnet"
msgid "Version '%s' for '%s' was not found"
msgstr "Versjon «%s» av «%s» ble ikke funnet"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Klarte ikke å finne oppgave «%s»"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Klarte ikke finne noen pakken med regex «%s»"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Klarte ikke finne noen pakken med regex «%s»"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Klarte ikke velge versjoner fra pakken «%s» siden den er kun virtuell"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Klarte ikke velge nyeste versjon fra pakken «%s» siden den er kun virtuell"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Klarte ikke velge kandidatversjon fra pakken «%s» siden den ikke har noen "
"kandidat"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Klarte ikke velge installert versjon fra pakken «%s» siden den ikke er "
"installert"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2992,177 +2967,59 @@ msgstr ""
"Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den "
"har ingen av dem"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Installerer %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Setter opp %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Fjerner %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "Fjerner %s fullstendig"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Legger merke til at %s forsvinner"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Kjører etter-installasjonsutløser %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Mappa «%s» mangler"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Klarte ikke åpne fila «%s»"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Forbereder %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Unpacking %s"
-msgstr "Pakker ut %s"
+msgid "Unable to parse Release file %s"
+msgstr "Klarer ikke å fortolke Release-fila %s"
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Preparing to configure %s"
-msgstr "Forbereder oppsett av %s"
+msgid "No sections in Release file %s"
+msgstr "Ingen avsnitt i Release-fila %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Installed %s"
-msgstr "Installerte %s"
+msgid "No Hash entry in Release file %s"
+msgstr "Ingen sjekksumoppføring i Release-fila %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Forbereder fjerning av %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ugyldig «Valid-Until»-oppføring i Release-fila %s"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Removed %s"
-msgstr "Fjernet %s"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ugyldig «Date»-oppføring i Release-fila %s"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Forbereder å fullstendig slette %s"
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lit %lim %lis"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Completely removed %s"
-msgstr "Fjernet %s fullstendig"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Kan ikke skrive til %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr "Ingen apport-rapport skrevet for MaxReports allerede er nådd"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "avhengighetsproblemer - lar den være uoppsatt"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en "
-"følgefeil fra en tidligere feil."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
-"feil"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for "
-"minne»-feil"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
-"feil"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «dpkg I/O»-feil"
+msgid "%lih %limin %lis"
+msgstr "%lit %lim %lis"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Klarte ikke låse den administrative mappen (%s). Bruker en annen prosess den?"
+msgid "%limin %lis"
+msgstr "%lim %lis"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Klarte ikke låse den administrative mappen (%s). Er du root?"
+msgid "%lis"
+msgstr "%lis"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet,"
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Ikke låst"
+msgid "Selection %s not found"
+msgstr "Fant ikke utvalget %s"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3297,35 +3154,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s ... Ferdig"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lit %lim %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lit %lim %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%lim %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Fant ikke utvalget %s"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Kan ikke utføre mmap på en tom fil"
@@ -3391,107 +3219,274 @@ msgstr "Klarer ikke å fastsette monteringspunktet %s"
msgid "Failed to stat the cdrom"
msgstr "Klarer ikke å få statusen på CD-spilleren"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Ukjent typeforkortelse: «%c»"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Åpner oppsettsfila %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, 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:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaksfeil %s:%u: Feil på taggen"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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:881
+#: apt-pkg/contrib/configuration.cc:887
#, 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:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaksfeil %s:%u: Inkludert herfra"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, 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:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "Syntaksfeil %s:%u: clear-direktivet krever et valgtre som argument"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, 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/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Kjenner ikke kommandolinjevalget «%c» (fra %s)."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Skjønner ikke kommandolinjevalget %s"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Kommandolinjevalget %s er ikke boolsk"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Valget %s krever et argument."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Valg %s: Angivelsen av oppsettselementet må ha en =<verdi>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, 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:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Valget «%s» er for langt"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, 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:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Ugyldig operasjon %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Installerer %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Setter opp %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Fjerner %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "Fjerner %s fullstendig"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Legger merke til at %s forsvinner"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Kjører etter-installasjonsutløser %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Mappa «%s» mangler"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Klarte ikke åpne fila «%s»"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Forbereder %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Pakker ut %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Forbereder oppsett av %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "Installerte %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Forbereder fjerning av %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "Fjernet %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Forbereder å fullstendig slette %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "Fjernet %s fullstendig"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Kan ikke skrive til %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr "Ingen apport-rapport skrevet for MaxReports allerede er nådd"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "avhengighetsproblemer - lar den være uoppsatt"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en "
+"følgefeil fra en tidligere feil."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
+"feil"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for "
+"minne»-feil"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
+"feil"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «dpkg I/O»-feil"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Klarte ikke låse den administrative mappen (%s). Bruker en annen prosess den?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Klarte ikke låse den administrative mappen (%s). Er du root?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet,"
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Ikke låst"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "DropNode ble startet på et knutepunkt som ennå er lenket"
@@ -3596,7 +3591,7 @@ msgstr "Dette er ikke et gyldig DEB-arkiv, mangler «%s»-medlemmet"
msgid "Internal error, could not locate member %s"
msgstr "Intern feil, fant ikke medlemmet %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Kontrollfila kan ikke tolkes"
@@ -3625,23 +3620,23 @@ msgstr "Arkivet er for kort"
msgid "Failed to read the archive headers"
msgstr "Klarte ikke å lese arkivhodene"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Klarte ikke å opprette rør"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Klarte ikke å kjøre gzip "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Ødelagt arkiv"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Ukjent TAR-hode: type %u, medlem %s"
diff --git a/po/ne.po b/po/ne.po
index e21c70f4d..4c6f2d098 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2006-06-12 14:35+0545\n"
"Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
"Language-Team: Nepali <info@mpp.org.np>\n"
@@ -22,148 +22,148 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "प्याकेज %s संस्करण %s संग एउटा नभेटिएको dep छ:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "कूल प्याकेज नामहरू :"
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid "Total package structures: "
msgstr "कूल प्याकेज नामहरू :"
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " सामान्य प्याकेजहरू:"
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr "शुद्ध अवास्तविक प्याकेजहरू:"
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " एकल अवास्तविक प्याकेजहरू:"
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " मिश्रित अवास्तविक प्याकेजहरू:"
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " हराइरहेको:"
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "कूल भिन्न संस्करणहरू:"
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
#, fuzzy
msgid "Total distinct descriptions: "
msgstr "कूल भिन्न संस्करणहरू:"
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "कूल निर्भरताहरू:"
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "जम्मा ver/file सम्बन्धहरू: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
#, fuzzy
msgid "Total Desc/File relations: "
msgstr "जम्मा ver/file सम्बन्धहरू: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "कूल उपलब्ध मानचित्रणहरू:"
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "कूल विश्वव्यापी स्ट्रिङ्गहरू:"
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "कूल शिथिल खाली ठाऊँ:"
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "को लागि कूल खाली ठाऊँ लेखांकन:"
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "प्याकेज फाइल %s sync भन्दा बाहिर छ ।"
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "कुनै प्याकेजहरू फेला परेन"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
#, fuzzy
msgid "You must give at least one search pattern"
msgstr "तपाईँले एउटा वास्तविक बान्की दिनुपर्छ"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "प्याकेज %s तोक्न असक्षम भयो"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "प्याकेज फाइलहरू:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "क्यास sync भन्दा बाहिर छ, प्याकेज फाइल x-ref गर्न सक्दैन"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "पिन गरिएका प्याकेजहरू:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(फेला परेन)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " स्थापना भयो:"
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " उमेद्वार:"
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(कुनै पनि होइन)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr "प्याकेज पिन:"
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " संस्करण तालिका:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, 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:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -237,21 +237,21 @@ msgstr ""
" -o=? एउटा स्वेच्छाचारी कनफिगरेसन फाइल सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
"धेरै जानकारीकोप लागि apt-cache(8) र apt.conf(5) म्यानुल पृष्टहरू हेर्नुहोस् ।\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "कृपया यो डिस्कको लागि नाम उपलब्ध गराउनुहोस्, जस्तै 'Debian 2.1r1 Disk 1'"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "कृपया ड्राइभमा डिस्क घुसाउनुहोस् र इन्टर थिच्नुहोस्"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr " %s मा %s पुन:नामकरण असफल भयो"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -259,7 +259,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "तपाईँको सेटमा बाँकी सि डि हरुको लागि यो प्रक्रिया फेरी गर्नुहोस् । "
@@ -295,83 +295,78 @@ msgstr ""
" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "तर %s स्थापना हुनुपर्यो"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "तर %s स्थापना हुनुपर्यो"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -379,113 +374,113 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "स्रोत फड्काउनुहोस् %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "केही संग्रह फड्काउन असफल भयो ।"
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "अनप्याक आदेश '%s' असफल भयो ।\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "निर्माण आदेश '%s' असफल भयो ।\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "शाखा प्रक्रिया असफल भयो"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, 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:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -494,24 +489,24 @@ msgstr ""
"%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण "
"आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन "
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । "
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
@@ -618,11 +613,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -636,52 +631,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "तर यो स्थापना भएन"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "तर %s स्थापना हुनुपर्यो"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "तर %s स्थापना हुनुपर्यो"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "तर %s स्थापना हुनुपर्यो"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "%s खोल्न असफल"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -902,7 +898,7 @@ msgstr "डेटा सकेटको जडान समय सकियो"
msgid "Unable to accept connection"
msgstr "जडान स्वीकार गर्न असक्षम भयो"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "समस्या द्रुतान्वेषण फाइल"
@@ -991,36 +987,37 @@ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट
msgid "Unable to connect to %s:%s:"
msgstr "%s %s मा जडान गर्न असफल भयो:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
+#, fuzzy
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
-msgstr "हस्ताक्षर रूजू गर्न 'apt-key' कार्यन्वयन गर्न सकिएन (के gnupg स्थापना भयो?)"
+msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gnupg स्थापना भयो?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "apt-key कार्यन्वयन गर्दा अज्ञात त्रुटि"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1030,31 +1027,31 @@ msgstr "निम्न हस्ताक्षरहरू रूजू हु
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "फाइलमा त्रुटि लेखिदैछ"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "सर्भरबाट त्रुटि पढिदैछ"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "फाइलमा त्रुटि लेखिदैछ"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "असफल चयन गर्नुहोस्"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "जडान समय सकियो"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ"
@@ -1062,53 +1059,294 @@ msgstr "निर्गात फाइलमा त्रुटि लेखि
msgid "Waiting for headers"
msgstr "हेडरहरुको लागि पर्खिदैछ"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "खराब हेडर लाइन"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP सर्भरले अवैध जवाफ हेडर पठायो"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP सर्भरले अवैध सामग्री-लम्बाई हेडर पठायो"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP सर्भरले अवैध सामग्री-दायरा हेडर पठायो"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "HTTP सर्भर संग भाँचिएको दायरा समर्थन छ"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "अज्ञात मिति ढाँचा"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "खराब हेडर डेटा"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "जडान असफल भयो"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "आन्तरिक त्रुटि"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "निर्भरताहरू सुधार गरिदैछ..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr "असफल भयो ।"
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr "काम भयो"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।"
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "नभेटिएका निर्भरताहरू । -f प्रयोग गरेर प्रयास गर्नुहोस् ।"
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [स्थापना भयो]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [स्थापना भयो]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [स्थापना भयो]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [स्थापना भयो]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "तर %s स्थापना भयो"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "तर %s स्थापना हुनुपर्यो"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "तर यो स्थापनायोग्य छैन"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "तर यो अवास्तविक प्याकेज होइन"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "तर यो स्थापना भएन"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "तर यो स्थापना हुन गइरहेको छैन"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr "वा"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "निम्न प्याकेजहरू हटाइनेछन्:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (%s कारणले) "
+
+#: apt-private/private-output.cc:696
+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"
+"तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu पुन: स्थापना गरियो, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu स्तर कम गरियो, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "आन्तरिक त्रुटि, स्थापना प्याकेजहरुलाई भाँचिएको प्याकेज भनिन्थ्यो!"
@@ -1360,247 +1598,6 @@ msgstr "प्याकेज %s स्थापना भएन, त्यस
msgid "Package '%s' is not installed, so not removed\n"
msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "निर्भरताहरू सुधार गरिदैछ..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr "असफल भयो ।"
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "निर्भरताहरू सुधार गर्न असक्षम भयो"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "स्तर वृद्धि सेटलाई न्यूनतम गर्न असक्षम भयो"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr "काम भयो"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "यी सुधार गर्न तपाईँले 'apt-get -f install' चलाउन पर्छ ।"
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "नभेटिएका निर्भरताहरू । -f प्रयोग गरेर प्रयास गर्नुहोस् ।"
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [स्थापना भयो]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [स्थापना भयो]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [स्थापना भयो]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [स्थापना भयो]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "तर %s स्थापना भयो"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "तर %s स्थापना हुनुपर्यो"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "तर यो स्थापनायोग्य छैन"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "तर यो अवास्तविक प्याकेज होइन"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "तर यो स्थापना भएन"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "तर यो स्थापना हुन गइरहेको छैन"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr "वा"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "निम्न प्याकेजहरुले निर्भरताहरू भेटेनन्:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "निम्न प्याकेजहरू हटाइनेछन्:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "निम्न प्याकेजहरू पछाडि राखिनेछन्:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "निम्न प्याकेजहरू स्तर वृद्धि हुनेछन्:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "निम्न प्याकेजहरू स्तरकम गरिनेछन्:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "निम्न भइरहेको प्याकेजहरू परिवर्तन हुनेछैन:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (%s कारणले) "
-
-#: apt-private/private-output.cc:696
-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"
-"तपाईँ के गरिरहेको यकिन नभएसम्म यो काम गरिने छैन!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu स्तर वृद्धि गरियो, %lu नयाँ स्थापना भयो, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu पुन: स्थापना गरियो, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu स्तर कम गरियो, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu हटाउन र %lu स्तर वृद्धि गरिएन ।\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1655,20 +1652,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "हान्नुहोस्"
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "हान्नुहोस्:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "प्राप्त गर्नुहोस्:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "प्राप्त गर्नुहोस्:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1694,17 +1695,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "%s पढ्न असफल भयो"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1780,7 +1781,7 @@ msgstr ""
msgid "Merging available information"
msgstr "उपलब्ध सूचना गाँभिदैछ"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1804,46 +1805,46 @@ msgstr ""
" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "%s स्थिर गर्न असक्षम भयो"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr " %s मा लेख्न असक्षम"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? "
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "प्याकेज विस्तार सूचि अति लामो छ"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "स्रोत विस्तार सूचि अति लामो छ"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "सामाग्री फाइलहरुमा हेडर लेख्दा त्रुटि"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "सामग्री %sप्रक्रिया गर्दा त्रुटि"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1926,11 +1927,11 @@ msgstr ""
" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "कुनै चयनहरू मेल खाएन"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "केही फाइलहरू प्याकेज फाइल समूह `%s' मा हराइरहेको छ"
@@ -2040,22 +2041,22 @@ msgstr "यस %sB हिटको डि लिङ्क सिमा।\n"
msgid "Archive had no package field"
msgstr "संग्रह संग कुनै प्याकेज फाँट छैन"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s संभारकर्ता %s हो %s होइन\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
@@ -2141,7 +2142,7 @@ msgstr "समस्या अनलिङ्क भइरहेछ %s"
msgid "Failed to rename %s to %s"
msgstr " %s मा %s पुन:नामकरण असफल भयो"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2166,11 +2167,11 @@ msgstr ""
" -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
" -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "अज्ञात प्याकेज रेकर्ड!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2242,6 +2243,26 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "MD5Sum मेल भएन"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "विधि ड्राइभर %s फेला पार्न सकिएन ।"
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "विधि %s सही रुपले सुरू हुन सकेन"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "प्याकेज सूचीहरू वा वस्तुस्थिति फाइल पद वर्णन गर्न वा खोल्न सकिएन ।"
@@ -2254,178 +2275,299 @@ msgstr "यो समस्याहरू सुधार्न तपाईँ
msgid "The list of sources could not be read."
msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।"
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "खाली प्याकेज क्यास"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "प्याकेज क्यास फाइल दूषित भयो "
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "प्याकेज क्यास फाइल एउटा अमिल्दो संस्करण हो"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "प्याकेज क्यास फाइल दूषित भयो "
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "यो APT ले संस्करण प्रणालीलाई समर्थन गर्दैन '%s'"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "प्याकेज क्यास विभिन्न वास्तुकलाको लागि निर्माण भएको हो"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "आधारित"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "पुन:आधारित"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "सुझाव दिन्छ"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "सिफारिस गर्दछ"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "द्वन्दहरू"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "बदल्छ"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "वेकायमहरू"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "महत्वपूर्ण"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "आवश्यक"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "मानक"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "वैकल्पिक"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "अतिरिक्त"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
-msgstr "स्तर वृद्धि गणना गरिदैछ."
+msgstr "स्तर वृद्धि गणना गरिदैछ"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "विधि ड्राइभर %s फेला पार्न सकिएन ।"
+msgid "Index file type '%s' is not supported"
+msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
+
+#: apt-pkg/sourcelist.cc:206
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "विधि %s सही रुपले सुरू हुन सकेन"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:208
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "निर्भरता ट्री निर्माण गरिदैछ"
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)"
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "उमेद्वार संस्करणहरू"
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "निर्भरता सिर्जना"
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s खोलिदैछ"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "उपलब्ध सूचना गाँभिदैछ"
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)"
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
+
+#: apt-pkg/sourcelist.cc:416
#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "%s खोल्न असफल"
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "फाइल %s लेख्न असफल भयो"
+msgid "Clean of %s is not supported"
+msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s स्थिर गर्न असक्षम भयो ।"
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "क्यास संग एउटा नमिल्दो संस्करण प्रणाली छ"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:279
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
+
+#: apt-pkg/pkgcachegen.cc:591
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन"
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "प्याकेज सूचिहरू पढिदैछ"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) ।"
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "MD5Sum मेल भएन"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "साइज मेल खाएन"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "अवैध सञ्चालन %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "त्रुटि लेख्नुहोस्"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2433,7 +2575,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
@@ -2449,49 +2591,49 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2500,125 +2642,53 @@ msgstr ""
"%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
"निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) "
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।"
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "क्यास संग एउटा नमिल्दो संस्करण प्रणाली छ"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:279
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "प्याकेज सूचिहरू पढिदैछ"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "बिक्रता ब्ल्क %s ले कुनै औठाछाप समाविष्ट गर्दैन"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "आंशिक संग्रह डाइरेक्ट्री %s हराइरहेछ ।"
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "अनुक्रमणिका फाइल प्रकार '%s' समर्थित छैन"
+msgid "Unable to lock directory %s"
+msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ (%s बाँकी छ)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "%li को %li फाइल पुन:प्राप्त गरिदैछ"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"केही अनुक्रमणिका फाइलहरू डाउनलोड गर्न असफल भयो, तिनीहरू उपेक्षित भए, वा सट्टामा पुरानो "
-"एउटा प्रयोग गरियो ।"
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "तपाईँको स्रोत सूचिमा केही 'source' URIs राख्नुहोस्"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s स्थिर गर्न असक्षम भयो ।"
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2640,19 +2710,19 @@ msgstr "पिन टाइप %s बुझ्न सकिएन "
msgid "No priority (or zero) specified for pin"
msgstr "पिनको लागि कुनै प्राथमिकता (वा शून्य) निर्दिष्ट छैन"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "फाइल %s खोल्न सकिएन"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2663,10 +2733,14 @@ msgstr ""
"हटाउनु पर्नेछ । यो प्राय नराम्रो हो, तर यदि तपाईँ यो साँच्चै गर्न चाहनुहुन्छ भने, APT::"
"Force-LoopBreak विकल्प सक्रिय गर्नुहोस् ।"
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।"
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"केही अनुक्रमणिका फाइलहरू डाउनलोड गर्न असफल भयो, तिनीहरू उपेक्षित भए, वा सट्टामा पुरानो "
+"एउटा प्रयोग गरियो ।"
#: apt-pkg/cdrom.cc:571
#, fuzzy
@@ -2734,11 +2808,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "प्यकेज सूचिहरू प्रतिलिपी गरिदैछ..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "नयाँ स्रोत सूचि लेखिदैछ\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "यो डिस्कको लागि स्रोत सूचि प्रविष्टिहरू:\n"
@@ -2748,7 +2822,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "प्याकेज %s पुन:स्थापना हुन चाहन्छ, तर यसको लागि मैले एउटा संग्रह फेला पार्न सकिन ।"
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2756,139 +2830,41 @@ msgstr ""
"त्रुटि, pkgProblemResolver:: समाधानले विच्छेदन सिर्जना गर्दछ, यो भइरहेको प्याकेजहरुको "
"कारणले गर्दा हो ।"
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।"
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)"
-
-#: apt-pkg/indexrecords.cc:83
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-
-#: apt-pkg/indexrecords.cc:91
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "द्रष्टब्य, %s को सट्टा %s चयन भइरहेछ\n"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:152
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
-
-#: apt-pkg/indexrecords.cc:171
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "निर्भरता ट्री निर्माण गरिदैछ"
-#: apt-pkg/sourcelist.cc:170
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "उमेद्वार संस्करणहरू"
-#: apt-pkg/sourcelist.cc:173
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "निर्भरता सिर्जना"
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "उपलब्ध सूचना गाँभिदैछ"
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/depcache.cc:252
#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
+msgid "Failed to open StateFile %s"
+msgstr "%s खोल्न असफल"
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:258
#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)"
-
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)"
-
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
-
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "%s खोलिदैछ"
-
-#: apt-pkg/sourcelist.cc:371
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "फाइल %s लेख्न असफल भयो"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
-
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन"
+msgid "Unable to parse package file %s (%d)"
+msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2900,208 +2876,101 @@ msgstr " '%s' को लागि '%s' निष्काशन फेला प
msgid "Version '%s' for '%s' was not found"
msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "प्याकेज फेला पार्न सकिएन %s"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
+#: apt-pkg/indexrecords.cc:83
#, fuzzy, c-format
-msgid "Installing %s"
-msgstr " %s स्थापना भयो"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr " %s कनफिगर गरिदैछ"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr " %s हटाइदैछ"
+msgid "Unable to parse Release file %s"
+msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/indexrecords.cc:91
#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr " %s पूर्ण रुपले हट्यो"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "No sections in Release file %s"
+msgstr "द्रष्टब्य, %s को सट्टा %s चयन भइरहेछ\n"
-#: apt-pkg/deb/dpkgpm.cc:112
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Running post-installation trigger %s"
+msgid "No Hash entry in Release file %s"
msgstr ""
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/indexrecords.cc:145
#, fuzzy, c-format
-msgid "Directory '%s' missing"
-msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/indexrecords.cc:164
#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "फाइल %s खोल्न सकिएन"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr " %s तयार गरिदैछ"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr " %s अनप्याक गरिदैछ"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, c-format
-msgid "Preparing to configure %s"
-msgstr " %s कनफिगर गर्न तयार गरिदैछ"
-
-#: apt-pkg/deb/dpkgpm.cc:1012
-#, c-format
-msgid "Installed %s"
-msgstr " %s स्थापना भयो"
-
-#: apt-pkg/deb/dpkgpm.cc:1017
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr " %s हटाउन तयार गरिदैछ"
-
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, c-format
-msgid "Removed %s"
-msgstr " %s हट्यो"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Completely removed %s"
-msgstr " %s पूर्ण रुपले हट्यो"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr " %s मा लेख्न असक्षम"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
+#, c-format
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "%lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
+msgstr "चयन %s फेला पार्न सकिएन"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3236,35 +3105,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... गरियो"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "चयन %s फेला पार्न सकिएन"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "एउटा खाली फाइल mmap बनाउन सकिएन"
@@ -3327,107 +3167,263 @@ msgstr "माउन्ट बिन्दु %s स्थिर गर्न
msgid "Failed to stat the cdrom"
msgstr "सिडी रोम स्थिर गर्न असफल भयो"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "नचिनिएको टाइप संक्षिप्त रुप: '%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "वाक्य संरचना त्रुटि %s:%u: बन्द कुनै नाम बिना सुरू हुन्छ ।"
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "वाक्य संरचना त्रुटि %s:%u: वैरुप गरिएको ट्याग"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "वाक्य संरचना त्रुटि %s:%u: मान पछाडि अतिरिक्त जंक"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "वाक्य संरचना त्रुटि %s:%u: निर्देशनहरू माथिल्लो तहबाट मात्र हुन्छ"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "वाक्य संरचना त्रुटि %s:%u: अति धेरै नेस्टेड समावेश गर्दछ"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "वाक्य संरचना त्रुटि %s:%u: यहाँ बाट समावेश गरेको"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "वाक्य संरचना त्रुटि %s:%u: समर्थन नभएको डाइरेक्टिभ '%s'"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, fuzzy, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "वाक्य संरचना त्रुटि %s:%u: निर्देशनहरू माथिल्लो तहबाट मात्र हुन्छ"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "वाक्य संरचना त्रुटि %s:%u:फाइलको अन्त्यमा अतिरिक्त जंक"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "आदेश लाइन विकल्प '%c' [%s बाट] ज्ञात छैन ।"
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "आदेश लाइन विकल्प %s बुझिएन"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "आदेश लाइन विकल्प %s बूलियन छैन"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "विकल्प %s लाई एउटा तर्कको आवश्यकता पर्दछ ।"
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "विकल्प %s: कनफिगरेसन वस्तु विशिष्टिकरण संग एउटा =<val> हुनुपर्छ ।"
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "विकल्प %s लाई एउटा इन्टिजर तर्कको आवश्यक पर्दछ, '%s' होइन"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "विकल्प '%s' अति लामो छ"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "अर्थ %s बुझिएन, सत्य वा झूठो प्रयास गर्नुहोस् ।"
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "अवैध सञ्चालन %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr " %s स्थापना भयो"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr " %s कनफिगर गरिदैछ"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr " %s हटाइदैछ"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr " %s पूर्ण रुपले हट्यो"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "फाइल %s खोल्न सकिएन"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr " %s तयार गरिदैछ"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr " %s अनप्याक गरिदैछ"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr " %s कनफिगर गर्न तयार गरिदैछ"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr " %s स्थापना भयो"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr " %s हटाउन तयार गरिदैछ"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr " %s हट्यो"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr " %s पूर्ण रुपले हट्यो"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr " %s मा लेख्न असक्षम"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "अहिलेसम्म लिङ्क गरिएको नोडमा बोलाइएको ड्रपनोड"
@@ -3532,7 +3528,7 @@ msgstr "यो वैध DEB संग्रह होइन, '%s' सदस्
msgid "Internal error, could not locate member %s"
msgstr "आन्तरीक त्रुटि, सदस्य तोक्न सक्दैन %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "पद वर्णन गर्न नसकिने नियन्त्रण फाइल"
@@ -3561,23 +3557,23 @@ msgstr "संग्रह अति छोटो छ"
msgid "Failed to read the archive headers"
msgstr "संग्रह हेडरहरू पढ्न असफल"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "पाइपहरू सिर्जना गर्न असफल"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "gzip कार्यन्वयन गर्न असफल"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "संग्रह दूषित भयो"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "टार चेकसम असफल भयो, संग्रह दूषित भयो"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "अज्ञात टार हेडर प्रकार %u, सदस्य %s"
diff --git a/po/nl.po b/po/nl.po
index 8660e5d4a..5c774fe8d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,4 +1,4 @@
-# Dutch translation of apt.
+# Dutch po-file for apt
# Copyright (C) 2002-2011 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the apt package.
# Guus Sliepen <guus@sliepen.warande.net>, 2002.
@@ -6,165 +6,168 @@
# Wannes Soenen <wannes@wannes.cjb.net>, 2002.
# Frans Pop <elendil@planet.nl>, 2010.
# Jeroen Schot <schot@a-eskwadraat.nl>, 2011.
+# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.15.9\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
-"PO-Revision-Date: 2011-12-05 17:10+0100\n"
-"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
-"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
+"PO-Revision-Date: 2014-11-09 23:47+0100\n"
+"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
+"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
"Language: nl\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: cmdline/apt-cache.cc:149
#, 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:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Totaal aantal pakketnamen: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Totaal aantal pakketstructuren: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Normale pakketten: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Zuiver virtuele pakketten: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Losstaande virtuele pakketten: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Gemengde virtuele pakketten: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Ontbrekend: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Totaal aantal verschillende versies: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Totaal aantal verschillende beschrijvingen: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Totaal aantal vereisten: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Totaal aantal versie/bestand-relaties: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Totaal aantal Beschrijving/bestand-relaties: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
-msgstr "Totaal aantal 'Voorziet'-toewijzingen "
+msgstr "Totaal aantal 'Voorziet'-toewijzingen: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Totaal aantal geglobde strings: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Totale onbenutte ruimte: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Totale hoeveelheid verantwoorde ruimte: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakketbestand %s is niet meer gesynchroniseerd."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Geen pakketten gevonden"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
-msgstr "U dient precies één zoekpatroon op te geven"
+msgstr "U dient minstens één zoekpatroon op te geven"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
+"Dit commando is verouderd. Gelieve in de plaats 'apt-mark showauto' te "
+"gebruiken."
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Kan pakket %s niet vinden"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Pakketbestanden:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Cache loopt niet synchroon, kan pakketbestand niet 'x-ref'-en"
+msgstr ""
+"Cache loopt niet synchroon, kruisverwijzing naar pakketbestand lukt niet"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Vastgepinde pakketten:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(niet gevonden)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Geïnstalleerd: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Kandidaat: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(geen)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Pakketpin: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Versietabel:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s voor %s gecompileerd op %s %s\n"
-#: cmdline/apt-cache.cc:1829
-#, fuzzy
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -201,31 +204,28 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
"Gebruik: apt-cache [opties] opdracht\n"
-" apt-cache [opties] add bestand1 [bestand2 ...]\n"
" apt-cache [opties] showpkg pakket1 [pakket2 ...]\n"
" apt-cache [opties] showsrc pakket1 [pakket2 ...]\n"
"\n"
-"apt-cache is een basaal hulpmiddel waarmee u de binaire cachebestanden\n"
-"van APT kunt manipuleren en informatie daaruit kunt opvragen.\n"
+"apt-cache is een basaal hulpmiddel waarmee u informatie kunt\n"
+"opvragen uit de binaire cachebestanden van APT\n"
"\n"
"Opdrachten:\n"
-" add - Voeg een pakketbestand toe aan de broncache.\n"
-" gencaches - Bouw zowel de pakket- als de broncache.\n"
-" showpkg - Toon algemene informatie over een enkel pakket.\n"
-" showsrc - Toon bronrecords.\n"
-" stats - Toon enkele basisstatistieken.\n"
-" dump - Toon het gehele bestand in een compacte vorm.\n"
-" dumpavail - Print een beschikbaarheidsbestand op de standaarduitvoer.\n"
-" unmet - Toon niet-voldane vereisten.\n"
-" search - Toon lijst met pakketten die met regexpatroon overeenkomen.\n"
-" show - Toon een leesbaar overzicht voor het pakket.\n"
-" showauto - Toon een lijst van automatisch geïnstalleerde pakketten.\n"
-" depends - Toon de afhankelijkheden van een pakket.\n"
-" rdepends - Toon de pakketten die afhankelijk zijn van een pakket.\n"
-" pkgnames - Toon de namen van alle pakketten op het systeem.\n"
-" dotty - Genereer pakketgrafen voor GraphViz.\n"
-" xvcg - Genereer pakketgrafen voor xvcg.\n"
-" policy - Toon beleidsinstellingen.\n"
+" gencaches - Bouw zowel de pakket- als de broncache\n"
+" showpkg - Toon algemene informatie over een enkel pakket\n"
+" showsrc - Toon een rapport over de broncode\n"
+" stats - Toon enkele basisstatistieken\n"
+" dump - Toon het gehele bestand in een compacte vorm\n"
+" dumpavail - Print lijst met beschikbare pakketten op de standaarduitvoer\n"
+" unmet - Toon niet-voldane vereisten\n"
+" search - Doorzoek pakkettenlijst a.d.h.v. een regex-patroon\n"
+" show - Toon een leesbaar rapport over het pakket\n"
+" depends - Toon de afhankelijkheden van een pakket\n"
+" rdepends - Toon de pakketten die afhankelijk zijn van een pakket\n"
+" pkgnames - Toon de namen van alle pakketten op het systeem\n"
+" dotty - Genereer pakketschema's voor GraphViz\n"
+" xvcg - Genereer pakketschema's voor xvcg\n"
+" policy - Toon beleidsinstellingen\n"
"\n"
"Opties:\n"
" -h Deze hulptekst.\n"
@@ -233,36 +233,43 @@ msgstr ""
" -s=? De broncache.\n"
" -q Voortgangsindicator uitschakelen.\n"
" -i Toon alleen belangrijke vereisten voor de 'unmet'-opdracht.\n"
-" -c=? Lees dit configuratiebestand.\n"
-" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp.\n"
-"Zie de man-pagina's van apt-cache(8) en apt.conf(5) voor meer informatie.\n"
+" -c=? Lees dit configuratiebestand\n"
+" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
+"Raadpleeg de man-pagina's van apt-cache(8) en apt.conf(5) voor meer "
+"informatie.\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
"Gelieve een naam voor deze schijf op te geven, bijvoorbeeld 'Debian 5.0.3 "
"Schijf 1'"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Gelieve een schijf in het station te plaatsen en op 'enter' te drukken"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Aankoppelen van '%s' op '%s' is mislukt"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
"mount point."
msgstr ""
+"Het is niet gelukt om automatisch een cd-rom te vinden, ook niet op het "
+"standaard aankoppelpunt.\n"
+"U zou de optie --cdrom kunnen proberen om het aankoppelpunt voor de cd-rom "
+"in te stellen.\n"
+"Raadpleeg 'man apt-cdrom' voor meer informatie over het automatisch "
+"detecteren van een cd-rom en het aankoppelpunt."
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
-msgstr "Dit proces dient herhaald te worden voor alle CD's in uw set."
+msgstr "Dit proces dient herhaald te worden voor alle cd's in uw set."
#: cmdline/apt-config.cc:48
msgid "Arguments not in pairs"
@@ -285,90 +292,87 @@ msgid ""
msgstr ""
"Gebruik: apt-config [opties] opdracht\n"
"\n"
-"apt-config is een eenvoudig programma om het APT-configuratiebestand te "
+"apt-config is een eenvoudig hulpmiddel om het APT-configuratiebestand te "
"lezen\n"
"\n"
"Opdrachten:\n"
" shell - Shell modus\n"
-" dump - Toon de configuratie\n"
+" dump - Toon de configuratie\n"
"\n"
"Opties:\n"
" -h Deze hulptekst.\n"
-" -c=? Lees dit configuratiebestand.\n"
+" -c=? Lees dit configuratiebestand\n"
" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:224
+#, c-format
msgid "Can not find a package for architecture '%s'"
-msgstr "Kon geen enkel pakket vinden bij regex '%s'"
+msgstr "Kan geen pakket vinden voor architectuur '%s'"
-#: cmdline/apt-get.cc:322
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:311
+#, c-format
msgid "Can not find a package '%s' with version '%s'"
-msgstr "Kon geen enkel pakket vinden bij regex '%s'"
+msgstr "Kan geen pakket '%s' vinden met versienummer '%s'"
-#: cmdline/apt-get.cc:325
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:314
+#, c-format
msgid "Can not find a package '%s' with release '%s'"
-msgstr "Kon geen enkel pakket vinden bij regex '%s'"
+msgstr "Kan geen pakket '%s' vinden uit de uitgave '%s'"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "'%s' wordt genomen als bronpakket in plaats van '%s'\n"
+msgstr "'%s' wordt als bronpakket genomen in plaats van '%s'\n"
-#: cmdline/apt-get.cc:418
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:414
+#, c-format
msgid "Can not find version '%s' of package '%s'"
-msgstr "Negeer niet beschikbare versie '%s' van pakket '%s'"
+msgstr "Kan versie '%s' van pakket '%s' niet vinden"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Kon pakket %s niet vinden"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
-msgstr "%s is ingesteld voor handmatige installatie.\n"
+msgstr "%s staat ingesteld op handmatig geïnstalleerd.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
-msgstr "%s is ingesteld op automatische geïnstalleerd.\n"
+msgstr "%s staat ingesteld op automatische geïnstalleerd.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
+"Dit commando is verouderd. Gelieve in de plaats 'apt-mark auto' en 'apt-mark "
+"manual' te gebruiken."
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Kan de map %s niet vergrendelen"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Kon de ophaalmap niet vergrendelen"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
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:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kan geen bronpakket vinden voor %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -378,175 +382,175 @@ msgstr ""
"'%s' op:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:785
+#, c-format
msgid ""
"Please use:\n"
"bzr branch %s\n"
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
"Gebruik:\n"
-"bzr get %s\n"
-"om de nieuwste (mogelijk nog niet uit uitgebrachte) versie van het pakket op "
-"te halen.\n"
+"bzr branch %s\n"
+"om de nieuwste (mogelijk nog niet uitgebrachte) bijwerkingen van het pakket "
+"op te halen.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Moet %sB aan bronarchieven ophalen.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Ophalen bron %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Ophalen van sommige archieven is mislukt."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Ophalen klaar en alleen-ophalen-modus staat aan"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, 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:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uitpakopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, 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 pakket 'dpkg-dev' geïnstalleerd is.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Bouwopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Dochterproces is mislukt"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
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 er de bouwvereisten van te "
"controleren"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
+"Er is geen architectuurinformatie beschikbaar voor %s. Raadpleeg apt.conf(5) "
+"APT::Architectures om dit te configureren"
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Verwerken van de bouwvereisten is mislukt"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, 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:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s heeft geen bouwvereisten.\n"
-#: cmdline/apt-get.cc:1288
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1279
+#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr ""
-"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
-"onvindbaar is"
+"De vereiste %s van %s kan niet voldaan worden omdat %s niet toegestaan is "
+"voor de pakketten van '%s'"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
-"onvindbaar is"
+"De vereiste %s van %s kan niet voldaan worden omdat pakket %s onvindbaar is"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-"Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s "
-"is te nieuw"
+"Voldoen van vereiste %s van %s is mislukt: geïnstalleerd pakket %s is te "
+"nieuw"
-#: cmdline/apt-get.cc:1368
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1359
+#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
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"
+"De vereiste %s van %s kan niet voldaan worden omdat de beschikbare versie "
+"van pakket %s niet aan de versievereisten voldoet"
-#: cmdline/apt-get.cc:1374
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1365
+#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr ""
-"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
-"onvindbaar is"
+"De vereiste %s van %s kan niet voldaan worden omdat er geen geschikte versie "
+"is van pakket %s"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s"
+msgstr "Voldoen van de vereiste %s van %s is mislukt: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Bouwvereisten voor %s konden niet voldaan worden."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Verwerken van de bouwvereisten is mislukt"
#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
-#, fuzzy, c-format
+#, c-format
msgid "Changelog for %s (%s)"
-msgstr "Er wordt verbinding gemaakt met %s (%s)"
+msgstr "Logbestand met veranderingen aan %s (%s)"
#: cmdline/apt-get.cc:1615
msgid "Supported modules:"
msgstr "Ondersteunde modules:"
#: cmdline/apt-get.cc:1656
-#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -596,11 +600,11 @@ msgstr ""
" apt-get [opties] source pakket1 [pakket2 ...]\n"
"\n"
"apt-get is een eenvoudige commandoregel-interface voor het ophalen en\n"
-"installeren van pakketten. De meest gebruikte opdrachten zijn 'update\n"
-"en 'install'.\n"
+"installeren van pakketten. De meest gebruikte opdrachten zijn\n"
+"'update' en 'install'.\n"
"\n"
"Opdrachten:\n"
-" update - Haal de huidige versie van pakketlijsten op\n"
+" update - Haal een nieuwe lijst van pakketten op\n"
" upgrade - Voer een opwaardering uit\n"
" install - Installeer nieuwe pakketten (pakket is b.v. libc6, niet libc6."
"deb)\n"
@@ -608,48 +612,48 @@ msgstr ""
" autoremove - Verwijder automatisch alle ongebruikte pakketten\n"
" purge - Verwijder pakketten en hun configuratiebestanden\n"
" source - Haal bronarchieven op\n"
-" build-dep - Installeer de pakketten vereist voor het bouwen van "
-"bronpakketten\n"
-" dist-upgrade - Opwaardeer de distributie, zie apt-get(8)\n"
-" dselect-upgrade - Opwaardeer volgens dselect-selecties\n"
+" build-dep - Installeer de pakketten vereist voor het bouwen van een "
+"bronpakket\n"
+" dist-upgrade - Opwaardering van de distributie, zie apt-get(8)\n"
+" dselect-upgrade - Opwaardering volgens dselect-selecties\n"
" clean - Verwijder opgehaalde archiefbestanden\n"
" autoclean - Verwijder verouderde opgehaalde archiefbestanden\n"
" check - Controleer onvoldane vereisten\n"
+" changelog - Haal log op van wijzigingen aan een bepaald pakket en toon "
+"die\n"
+" download - Haal het binaire pakket op en plaats het in de werkmap\n"
"\n"
"Opties:\n"
" -h Deze hulptekst\n"
" -q Logbare uitvoer - geen voortgangsindicator\n"
-" -qq Geen uitvoer anders dan foutmeldingen\n"
+" -qq Geen uitvoer behalve van foutmeldingen\n"
" -d Alleen ophalen - archieven NIET installeren of uitpakken\n"
" -s Doe-niets. Doe alleen sorteersimulatie\n"
" -y Antwoord \"ja\" op alle vragen zonder ze te stellen\n"
-" -f Probeer door te gaan als de integriteitstest faalt\n"
+" -f Probeer een systeem met onvoldane afhankelijkheden te corrigeren\n"
" -m Probeer door te gaan als archieven niet gevonden kunnen worden\n"
" -u Toon ook een lijst van bijgewerkte pakketten\n"
" -b Bouw het bronpakket nadat het is opgehaald\n"
-" -V Toon uitgebreide versie nummers\n"
+" -V Toon uitgebreide versienummers\n"
" -c=? Lees dit configuratiebestand\n"
" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
-"Zie de apt-get(8), sources.list(5) en apt.conf(5) handleidingen\n"
+"Raadpleeg de man-pagina's apt-get(8), sources.list(5) en apt.conf(5)\n"
"voor meer informatie en opties.\n"
-" Deze APT heeft Super Koe kracht.\n"
+" Deze APT heeft Super Koekracht.\n"
#: cmdline/apt-helper.cc:36
msgid "Need one URL as argument"
-msgstr ""
+msgstr "Heb een URL als argument nodig"
#: cmdline/apt-helper.cc:49
-#, fuzzy
msgid "Must specify at least one pair url/filename"
-msgstr ""
-"U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet "
-"worden"
+msgstr "U dient minstens 1 paar van url/bestandsnaam op te geven"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
-msgstr ""
+msgstr "Ophalen mislukt"
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -662,53 +666,64 @@ msgid ""
"\n"
" This APT helper has Super Meep Powers.\n"
msgstr ""
+"Gebruik: apt-helper [opties] opdracht\n"
+" apt-helper [opties] download-file uri doelpad\n"
+"\n"
+"apt-helper is een intern hulpmiddel voor apt\n"
+"\n"
+"Opdrachten:\n"
+" download-file - haal opgegeven uri op en plaats in doelpad\n"
+" auto-detect-proxy - proxy opzoeken met behulp van apt.conf\n"
+"\n"
+" Deze APT-helper heeft Super Koekracht.\n"
-#: cmdline/apt-mark.cc:68
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:65
+#, c-format
msgid "%s can not be marked as it is not installed.\n"
-msgstr "maar het is niet geïnstalleerd"
+msgstr "%s kan niet gemarkeerd worden want het is niet geïnstalleerd.\n"
-#: cmdline/apt-mark.cc:74
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:71
+#, c-format
msgid "%s was already set to manually installed.\n"
-msgstr "%s is ingesteld voor handmatige installatie.\n"
+msgstr "%s was reeds ingesteld als handmatig geïnstalleerd.\n"
-#: cmdline/apt-mark.cc:76
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:73
+#, c-format
msgid "%s was already set to automatically installed.\n"
-msgstr "%s is ingesteld op automatische geïnstalleerd.\n"
+msgstr "%s was reeds ingesteld als automatisch geïnstalleerd.\n"
-#: cmdline/apt-mark.cc:241
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:238
+#, c-format
msgid "%s was already set on hold.\n"
-msgstr "%s is reeds de nieuwste versie.\n"
+msgstr "%s was reeds ingesteld op tegenhouden.\n"
-#: cmdline/apt-mark.cc:243
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:240
+#, c-format
msgid "%s was already not hold.\n"
-msgstr "%s is reeds de nieuwste versie.\n"
+msgstr "%s was reeds ingesteld op niet tegenhouden.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Er is gewacht op %s, maar die kwam niet"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
+#, c-format
msgid "%s set on hold.\n"
-msgstr "%s is ingesteld voor handmatige installatie.\n"
+msgstr "%s is ingesteld op tegenhouden.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
+#, c-format
msgid "Canceled hold on %s.\n"
-msgstr "Openen van %s is mislukt"
+msgstr "Tegenhouden van %s werd geannuleerd.\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
-msgstr ""
+msgstr "Het uitvoeren van dpkg mislukte. Bent u systeembeheerder?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -734,6 +749,30 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
+"Gebruik: apt-mark [opties] {auto|manual} pakket1 [pakket2 ...]\n"
+"\n"
+"apt-mark is een eenvoudige commandolijn-interface voor het markeren\n"
+"van pakketten als zijnde handmatig of automatisch geïnstalleerd.\n"
+"Het kan ook een lijst met markeringen weergeven.\n"
+"\n"
+"Opdrachten:\n"
+" auto - Markeer het vermelde pakket als automatisch geïnstalleerd\n"
+" manual - Markeer het vermelde pakket als manueel geïnstalleerd\n"
+" hold - Markeer een pakket als tegengehouden\n"
+" unhold - Markeer een pakket niet langer als tegengehouden\n"
+" showauto - Toon de lijst van automatisch geïnstalleerde pakketten\n"
+" showmanual - Toon de lijst van manueel geïnstalleerde pakketten\n"
+" showhold - Toon de lijst van tegengehouden pakketten\n"
+"\n"
+"Opties:\n"
+" -h Deze hulptekst\n"
+" -q Logbare uitvoer - geen voortgangsindicator\n"
+" -qq Geen uitvoer behalve van foutmeldingen\n"
+" -s Doe-niets. Toont alleen wat gedaan zou worden.\n"
+" -f lees/schrijf auto/manueel markeringen in het vermelde bestand\n"
+" -c=? Lees dit configuratiebestand\n"
+" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
+"Raadpleeg de man-pagina's apt-mark(8) en apt.conf(5) voor meer informatie."
#: cmdline/apt.cc:47
msgid ""
@@ -756,33 +795,52 @@ msgid ""
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
+"Gebruik: apt [opties] opdracht\n"
+"\n"
+"CLI voor apt.\n"
+"Basisopdrachten: \n"
+" list - geef een lijst van pakketten op basis van hun naam\n"
+" search - zoek in de pakketbeschrijvingen\n"
+" show - toon gedetailleerde informatie over het pakket\n"
+"\n"
+" update - werk de lijst van beschikbare pakketten bij\n"
+"\n"
+" install - installeer pakketten\n"
+" remove - verwijder pakketten\n"
+"\n"
+" upgrade - waardeer het systeem op door pakketten te installeren/op te "
+"waarderen\n"
+" full-upgrade - waardeer het systeem op door pakketten te verwijderen/te "
+"installeren/op te waarderen\n"
+"\n"
+" edit-sources - bewerk het bestand met informatie over de bron\n"
#: methods/cdrom.cc:203
#, c-format
msgid "Unable to read the cdrom database %s"
-msgstr "Kan de cd databank %s niet lezen"
+msgstr "Kan de cd-romdatabank %s niet lezen"
#: methods/cdrom.cc:212
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 ""
-"Om deze APT deze CD te laten herkennen kunt u best apt-cdrom gebruiken. 'apt-"
-"get update' is niet in staat om nieuwe CDs toe te voegen"
+"Om APT deze cd-rom te laten herkennen kunt u best 'apt-cdrom' gebruiken. "
+"'apt-get update' is niet in staat om nieuwe cd-rom's toe te voegen"
#: methods/cdrom.cc:222
msgid "Wrong CD-ROM"
-msgstr "Verkeerde CD"
+msgstr "Verkeerde cd-rom"
#: methods/cdrom.cc:249
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
-"Kan de CD in %s niet loskoppelen, mogelijk wordt die nog steeds gebruikt."
+"Kan de cd-rom in %s niet loskoppelen. Mogelijk wordt die nog steeds gebruikt."
#: methods/cdrom.cc:254
msgid "Disk not found."
-msgstr "Schijf niet gevonden"
+msgstr "Schijf niet gevonden."
#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281
msgid "File not found"
@@ -791,7 +849,7 @@ msgstr "Bestand niet gevonden"
#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
#: methods/rred.cc:608
msgid "Failed to stat"
-msgstr "stat is mislukt"
+msgstr "Kon status niet bepalen"
#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
msgid "Failed to set modification time"
@@ -799,7 +857,7 @@ msgstr "Instellen van de aanpassingstijd is mislukt"
#: methods/file.cc:48
msgid "Invalid URI, local URIS must not start with //"
-msgstr "Ongeldige URI, lokale URIs mogen niet beginnen met //"
+msgstr "Ongeldige URI. Lokale URI's mogen niet beginnen met //"
#. Login must be before getpeername otherwise dante won't work.
#: methods/ftp.cc:178
@@ -808,52 +866,53 @@ msgstr "Bezig met aanmelden"
#: methods/ftp.cc:184
msgid "Unable to determine the peer name"
-msgstr "Kan de 'peer'-naam niet bepalen"
+msgstr "Kan de naam van de peer niet vaststellen"
#: methods/ftp.cc:189
msgid "Unable to determine the local name"
-msgstr "Kan de lokale naam niet bepalen"
+msgstr "Kan de lokale naam niet vaststellen"
#: methods/ftp.cc:220 methods/ftp.cc:248
#, c-format
msgid "The server refused the connection and said: %s"
-msgstr "Onze verbinding is door de server geweigerd met bericht: %s"
+msgstr "De verbinding is door de server geweigerd met bericht: %s"
#: methods/ftp.cc:226
#, c-format
msgid "USER failed, server said: %s"
-msgstr "USER mislukt; bericht van server: %s"
+msgstr "USER (gebruiker) mislukt; bericht van de server: %s"
#: methods/ftp.cc:233
#, c-format
msgid "PASS failed, server said: %s"
-msgstr "PASS mislukt; bericht van server: %s"
+msgstr "PASS (wachtwoord) mislukt; bericht van de server: %s"
#: methods/ftp.cc:253
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-"Er was een proxy-server opgegeven, maar geen aanmeldscript, Acquire::ftp::"
+"Er was een proxy-server opgegeven, maar geen aanmeldscript. Acquire::ftp::"
"ProxyLogin is leeg."
#: methods/ftp.cc:281
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "Aanmeldscriptopdracht '%s' is mislukt; bericht van server: %s"
+msgstr ""
+"Opdracht '%s' uit het aanmeldscript is mislukt; bericht van de server: %s"
#: methods/ftp.cc:307
#, c-format
msgid "TYPE failed, server said: %s"
-msgstr "TYPE mislukt; bericht van server: %s"
+msgstr "TYPE mislukt; bericht van de server: %s"
#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
msgid "Connection timeout"
-msgstr "Verbinding is verlopen"
+msgstr "De verbinding is verlopen"
#: methods/ftp.cc:351
msgid "Server closed the connection"
-msgstr "Verbinding is verbroken door de server"
+msgstr "De verbinding is verbroken door de server"
#: methods/ftp.cc:354 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1515
#: apt-pkg/contrib/fileutl.cc:1524 apt-pkg/contrib/fileutl.cc:1529
@@ -863,7 +922,7 @@ msgstr "Leesfout"
#: methods/ftp.cc:361 methods/rsh.cc:209
msgid "A response overflowed the buffer."
-msgstr "Een reactie deed de buffer overlopen"
+msgstr "Een reactie deed de buffer overlopen."
#: methods/ftp.cc:378 methods/ftp.cc:390
msgid "Protocol corruption"
@@ -882,7 +941,7 @@ msgstr "Kon geen socket aanmaken"
#: methods/ftp.cc:713
msgid "Could not connect data socket, connection timed out"
-msgstr "Kon de datasocket niet verbinden, de verbinding verliep"
+msgstr "Kon de datasocket niet verbinden. De verbinding verliep"
#: methods/ftp.cc:717 methods/connect.cc:116
msgid "Failed"
@@ -902,11 +961,11 @@ msgstr "Kon geen socket binden"
#: methods/ftp.cc:754
msgid "Could not listen on the socket"
-msgstr "Kon niet op de socket niet luisteren"
+msgstr "Kon niet luisteren op de socket"
#: methods/ftp.cc:761
msgid "Could not determine the socket's name"
-msgstr "Kon de socketnaam niet bepalen"
+msgstr "Kon de socketnaam niet vaststellen"
#: methods/ftp.cc:793
msgid "Unable to send PORT command"
@@ -920,24 +979,24 @@ msgstr "Onbekende adresfamilie %u (AF_*)"
#: methods/ftp.cc:812
#, c-format
msgid "EPRT failed, server said: %s"
-msgstr "EPRT is mislukt; bericht van server: %s"
+msgstr "EPRT is mislukt; bericht van de server: %s"
#: methods/ftp.cc:832
msgid "Data socket connect timed out"
-msgstr "Datasocket verbinding is verlopen"
+msgstr "Verbinding met de datasocket is verlopen"
#: methods/ftp.cc:839
msgid "Unable to accept connection"
msgstr "Kan de verbinding niet aanvaarden"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
-msgstr "Probleem bij het hashen van het bestand"
+msgstr "Probleem bij het frommelen van het bestand"
#: methods/ftp.cc:892
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr "Kan bestand niet ophalen; bericht van server: %s"
+msgstr "Kan het bestand niet ophalen; bericht van de server: %s"
#: methods/ftp.cc:907 methods/rsh.cc:338
msgid "Data socket timed out"
@@ -946,7 +1005,7 @@ msgstr "Datasocket verliep"
#: methods/ftp.cc:944
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr "Data transfer is mislukt, server zei: %s"
+msgstr "Datatransfer is mislukt; bericht van de server: %s"
#. Get the files information
#: methods/ftp.cc:1027
@@ -955,7 +1014,7 @@ msgstr "Zoekopdracht"
#: methods/ftp.cc:1141
msgid "Unable to invoke "
-msgstr "Aanroepen mislukt van "
+msgstr "Mislukking bij aanroepen van "
#: methods/connect.cc:76
#, c-format
@@ -980,7 +1039,7 @@ msgstr "Kan de verbinding met %s:%s (%s) niet aangaan."
#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Kon niet verbinden met %s:%s (%s), de verbinding verliep"
+msgstr "Kon niet verbinden met %s:%s (%s); de verbinding verliep"
#: methods/connect.cc:126
#, c-format
@@ -1005,54 +1064,56 @@ msgid "Temporary failure resolving '%s'"
msgstr "Tijdelijke fout bij het opzoeken van '%s'"
#: methods/connect.cc:209
-#, fuzzy, c-format
+#, c-format
msgid "System error resolving '%s:%s'"
-msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)"
+msgstr "Systeemfout bij het opzoeken van '%s:%s'"
#: methods/connect.cc:211
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)"
+msgstr "Er gebeurde iets raars bij het omzetten van '%s:%s' (%i - %s)"
#: methods/connect.cc:258
#, c-format
msgid "Unable to connect to %s:%s:"
-msgstr "Kan geen verbinding maken met %s %s:"
+msgstr "Kan geen verbinding maken met %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
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"
+"Interne fout: ondertekening is goed, maar kon de vingerafdruk van de sleutel "
"niet bepalen?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Er is tenminste één ongeldige ondertekening gevonden."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"Kon 'apt-key' niet uitvoeren om ondertekening te verifiëren (is gnupg "
"geïnstalleerd?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
+"Bestand met niet-versleutelde ondertekening is ongeldig; kreeg '%s' (vereist "
+"het netwerk authenticatie?)"
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Onbekende fout bij het uitvoeren van apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "De volgende ondertekeningen waren ongeldig:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1062,93 +1123,340 @@ msgstr ""
#: methods/gzip.cc:79
msgid "Empty files can't be valid archives"
-msgstr ""
+msgstr "Lege bestanden kunnen geen geldige archieven zijn"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Fout bij het schrijven naar het bestand"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-"Fout bij het lezen van de server, andere kant heeft de verbinding gesloten"
+"Fout bij het lezen van de server. De andere kant heeft de verbinding gesloten"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Fout bij het lezen van de server"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Fout bij het schrijven naar bestand"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Selectie is mislukt"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Verbinding verliep"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
-msgstr "Fout bij het schrijven naar het uitvoerbestand"
+msgstr "Fout bij het schrijven naar uitvoerbestand"
#: methods/server.cc:52
msgid "Waiting for headers"
-msgstr "Wachtend op de kopteksten"
+msgstr "Wachten op de kopteksten"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Foute koptekstregel"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
-msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd"
+msgstr "De HTTP-server verstuurde een ongeldige 'reply'-koptekst"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr ""
-"Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd"
+msgstr "De HTTP-server verstuurde een ongeldige 'Content-Length'-koptekst"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr ""
-"Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd"
+msgstr "De HTTP-server verstuurde een ongeldige 'Content-Range'-koptekst"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Onbekend datumformaat"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Foute koptekstdata"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Verbinding mislukt"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Interne fout"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Bezig met oplijsten"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "Er is %i bijkomende versie. Gebruik schakelaar '-a' om het te zien."
+msgstr[1] ""
+"Er zijn %i bijkomende versies. Gebruik schakelaar '-a' om ze te zien."
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Vereisten worden gecorrigeerd..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " mislukt."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Kan vereisten niet corrigeren"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Klaar"
+
+#: apt-private/private-cachefile.cc:110
+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."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "onbekend"
+
+#: apt-private/private-output.cc:265
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[geïnstalleerd,opwaardeerbaar naar: %s]"
+
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr "[geïnstalleerd,lokaal]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[geïnstalleerd,automatisch verwijderbaar]"
+
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr "[geïnstalleerd,automatisch]"
+
+#: apt-private/private-output.cc:274
+msgid "[installed]"
+msgstr "[geïnstalleerd]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[opwaardeerbaar van: %s]"
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr "[overgebleven configuratie]"
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "maar %s is geïnstalleerd"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "maar %s zal geïnstalleerd worden"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "maar het is niet installeerbaar"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "maar het is een virtueel pakket"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "maar het is niet geïnstalleerd"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "maar het zal niet geïnstalleerd worden"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " of"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "De volgende pakketten hebben niet-voldane vereisten:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "De volgende pakketten zullen VERWIJDERD worden:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "De volgende pakketten zijn achtergehouden:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "De volgende pakketten zullen opgewaardeerd worden:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (vanwege %s) "
+
+#: apt-private/private-output.cc:696
+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"
+"Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu opgewaardeerd, %lu nieuw geïnstalleerd, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu opnieuw geïnstalleerd, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu gedegradeerd, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu niet volledig geïnstalleerd of verwijderd.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex-compilatiefout - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "De opdracht 'update' aanvaardt geen argumenten"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"%i pakket kan opgewaardeerd worden. Voer 'apt list --upgradable' uit om het "
+"te zien.\n"
+msgstr[1] ""
+"%i pakketten kunnen opgewaardeerd worden. Voer 'apt list --upgradable' uit "
+"om ze te zien.\n"
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr "Alle pakketten zijn up-to-date."
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
+msgstr "Bezig met sorteren"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+"Er is %i bijkomend record. Gebruik de schakeloptie '-a' om het te zien"
+msgstr[1] ""
+"Er zijn %i bijkomende records. Gebruik de schakeloptie '-a' om ze te zien."
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "geen echt pakket (virtueel)"
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
msgstr ""
+"OPMERKING: Dit is slechts een simulatie!\n"
+" Voor daadwerkelijke uitvoering heeft apt-get beheerdersrechten nodig.\n"
+" Houd er ook rekening mee dat vergrendeling is uitgeschakeld.\n"
+" Steun dus niet op haar relevantie voor de huidige concrete situatie!"
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Interne fout, InstallPackages is aangeroepen met defecte pakketten!"
+msgstr "Interne fout. InstallPackages is aangeroepen met defecte pakketten!"
#: apt-private/private-install.cc:90
msgid "Packages need to be removed but remove is disabled."
@@ -1156,12 +1464,12 @@ msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
#: apt-private/private-install.cc:109
msgid "Internal error, Ordering didn't finish"
-msgstr "Interne fout, rangschikken is niet voltooid"
+msgstr "Interne fout. Rangschikken is niet voltooid"
#: apt-private/private-install.cc:147
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-"Merkwaardig... De groottes kwamen niet overeen, gelieve apt@packages.debian."
+"Merkwaardig... De groottes kwamen niet overeen. Gelieve apt@packages.debian."
"org te mailen"
#. TRANSLATOR: The required space between number and unit is already included
@@ -1183,14 +1491,14 @@ msgstr "Er moeten %sB aan archieven opgehaald worden.\n"
#: apt-private/private-install.cc:166
#, c-format
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"
+msgstr "Na deze bewerking zal er %sB extra schijfruimte gebruikt worden.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
#: apt-private/private-install.cc:171
#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n"
+msgstr "Na deze bewerking zal er %sB schijfruimte vrijkomen.\n"
#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
msgid "There are problems and -y was used without --force-yes"
@@ -1198,7 +1506,7 @@ msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes"
#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking."
+msgstr "'Trivial Only' is opgegeven. Dit is echter geen triviale bewerking."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
@@ -1234,8 +1542,8 @@ msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-"Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --"
-"fix-missing proberen?"
+"Kon sommige archieven niet ophalen. Misschien kunt u 'apt-get update' "
+"uitvoeren of het met '--fix-missing' proberen?"
#: apt-private/private-install.cc:299
msgid "--fix-missing and media swapping is not currently supported"
@@ -1243,7 +1551,7 @@ msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund"
#: apt-private/private-install.cc:304
msgid "Unable to correct missing packages."
-msgstr "Geen oplossing voor de missende pakketten gevonden."
+msgstr "Geen oplossing gevonden voor de ontbrekende pakketten."
#: apt-private/private-install.cc:305
msgid "Aborting install."
@@ -1265,7 +1573,7 @@ msgstr[1] ""
#: apt-private/private-install.cc:345
msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Let op: Dit wordt automatische en bewust door dpkg gedaan."
+msgstr "Let op: dit wordt automatisch en bewust gedaan door dpkg."
#: apt-private/private-install.cc:366
msgid "We are not supposed to delete stuff, can't start AutoRemover"
@@ -1276,7 +1584,7 @@ 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"
+"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."
#.
@@ -1291,11 +1599,11 @@ msgstr ""
#.
#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
msgid "The following information may help to resolve the situation:"
-msgstr "De volgende informatie helpt u mogelijk verder:"
+msgstr "De volgende informatie kan misschien helpen de situatie op te lossen:"
#: apt-private/private-install.cc:481
msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt"
+msgstr "Interne fout. AutoRemover heeft dingen stukgemaakt"
#: apt-private/private-install.cc:488
msgid ""
@@ -1314,22 +1622,21 @@ msgstr[1] ""
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "%lu pakket is automatisch geïnstalleerd en is niet langer nodig.\n"
+msgstr[0] "%lu pakket was automatisch geïnstalleerd en is niet langer nodig.\n"
msgstr[1] ""
-"%lu pakketten zijn automatisch geïnstalleerd en zijn niet langer nodig.\n"
+"%lu pakketten waren automatisch geïnstalleerd en zijn niet langer nodig.\n"
#: apt-private/private-install.cc:494
-#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "U kunt deze verwijderen via 'apt-get autoremove'."
-msgstr[1] "U kunt deze verwijderen via 'apt-get autoremove'."
+msgstr[0] "Gebruik 'apt-get autoremove' om het te verwijderen."
+msgstr[1] "Gebruik 'apt-get autoremove' om ze te verwijderen."
#: apt-private/private-install.cc:587
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:"
+"U wilt waarschijnlijk 'apt-get -f install' uitvoeren om de volgende zaken op "
+"te lossen:"
#: apt-private/private-install.cc:589
msgid ""
@@ -1346,13 +1653,14 @@ msgid ""
"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"
-"een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n"
-"gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'."
+"Sommige pakketten konden niet geïnstalleerd worden. Dit kan betekenen\n"
+"dat u om een onmogelijke situatie gevraagd heeft, of, indien u\n"
+"de distributie 'unstable' gebruikt, dat sommige benodigde pakketten nog "
+"gemaakt moeten worden of uit 'Incoming' verwijderd werden."
#: apt-private/private-install.cc:633
msgid "Broken packages"
-msgstr "Niet-werkende pakketten:"
+msgstr "Niet-werkende pakketten"
#: apt-private/private-install.cc:710
msgid "The following extra packages will be installed:"
@@ -1377,14 +1685,14 @@ msgstr ""
#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
-"%s wordt overgeslagen, het is niet geïnstalleerd en alleen opwaardering is "
-"gevraagd.\n"
+"%s wordt overgeslagen, het is niet geïnstalleerd en er is alleen om "
+"opwaarderingen gevraagd.\n"
#: apt-private/private-install.cc:839
#, 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"
+"Herinstalleren van %s is niet mogelijk omdat het niet opgehaald kan worden.\n"
#: apt-private/private-install.cc:844
#, c-format
@@ -1397,265 +1705,22 @@ msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n"
#: apt-private/private-install.cc:897
-#, fuzzy, c-format
+#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n"
+msgstr "Versie '%s' (%s) geselecteerd voor '%s' omwille van '%s'\n"
#. TRANSLATORS: Note, this is not an interactive question
#: apt-private/private-install.cc:939
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n"
-
-#: apt-private/private-install.cc:945
-#, fuzzy, 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"
-
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Vereisten worden gecorrigeerd..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " mislukt."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Kan vereisten niet corrigeren"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Klaar"
-
-#: apt-private/private-cachefile.cc:110
-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."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Geïnstalleerd]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Geïnstalleerd]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Geïnstalleerd]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Geïnstalleerd]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "maar %s is geïnstalleerd"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "maar %s zal geïnstalleerd worden"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "maar het is niet installeerbaar"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "maar het is een virtueel pakket"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "maar het is niet geïnstalleerd"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "maar het zal niet geïnstalleerd worden"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " of"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "De volgende pakketten hebben niet-voldane vereisten:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "De volgende NIEUWE pakketten zullen geïnstalleerd worden:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "De volgende pakketten zullen VERWIJDERD worden:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "De volgende pakketten zijn achtergehouden:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "De volgende pakketten zullen opgewaardeerd worden:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "De volgende vastgehouden pakketten zullen gewijzigd worden:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (vanwege %s) "
-
-#: apt-private/private-output.cc:696
-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"
-"Dit dient NIET gedaan te worden tenzij u precies weet wat u doet!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu pakketten opgewaardeerd, %lu pakketten nieuw geïnstalleerd, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu opnieuw geïnstalleerd, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu gedegradeerd, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu te verwijderen en %lu niet opgewaardeerd.\n"
-
-#: apt-private/private-output.cc:739
#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex-compilatiefout - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "De opdracht 'update' aanvaard geen argumenten"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr ""
+"Pakket '%s' is niet geïnstalleerd, en wordt dus niet verwijderd. Bedoelde u "
+"'%s'?\n"
-#: apt-private/private-show.cc:156
+#: apt-private/private-install.cc:945
#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"OPMERKING: Dit is een simulatie!\n"
-" Voor daadwerkelijke uitvoering heeft apt-get beheerdersrechten nodig.\n"
-" Houd er ook rekening mee ook dat vergrendeling is uitgeschakeld en\n"
-" vertrouw dus niet op de relevantie voor de werkelijke huidige situatie!"
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Pakket '%s' is niet geïnstalleerd, en wordt dus niet verwijderd\n"
#: apt-private/private-download.cc:62
#, c-format
@@ -1667,15 +1732,15 @@ msgstr ""
#: apt-private/private-download.cc:94
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
-"WAARSCHUWING: De volgende pakketten kunnen niet geauthentificeerd worden:"
+"WAARSCHUWING: De volgende pakketten kunnen niet geauthenticeerd worden!"
#: apt-private/private-download.cc:98
msgid "Authentication warning overridden.\n"
-msgstr "Authentificatiewaarschuwing is genegeerd.\n"
+msgstr "Authenticiteitswaarschuwing werd genegeerd.\n"
#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
msgid "Some packages could not be authenticated"
-msgstr "Sommige pakketten konden niet geauthentificeerd worden"
+msgstr "Sommige pakketten konden niet geauthenticeerd worden"
#: apt-private/private-download.cc:108
msgid "Install these packages without verification?"
@@ -1697,34 +1762,38 @@ msgid "You don't have enough free space in %s."
msgstr "U heeft onvoldoende vrije schijfruimte op %s."
#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
+#, c-format
msgid "Failed to parse %s. Edit again? "
-msgstr "Hernoemen van %s naar %s is mislukt"
+msgstr "Verwerken van %s is mislukt. Opnieuw bewerken? "
#: apt-private/private-sources.cc:70
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
+msgstr "Uw bestand '%s' is gewijzigd. Voer 'apt-get update' uit."
#: apt-private/private-search.cc:69
msgid "Full Text Search"
-msgstr ""
+msgstr "Volledige tekst doorzoeken"
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Geraakt "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Geraakt:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Ophalen:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Ophalen:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Genegeerd "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Genegeerd:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Fout "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Fout:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1743,24 +1812,24 @@ msgid ""
" '%s'\n"
"in the drive '%s' and press enter\n"
msgstr ""
-"Medium wisselen: Gelieve de schijf met label\n"
+"Medium wisselen: gelieve de schijf met label\n"
" '%s'\n"
"in het station '%s' te plaatsen en op 'enter' te drukken\n"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Kan %s niet lezen"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1776,14 +1845,14 @@ msgstr "Geen spiegelbestand '%s' gevonden "
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
#: methods/mirror.cc:287
-#, fuzzy, c-format
+#, c-format
msgid "Can not read mirror file '%s'"
-msgstr "Geen spiegelbestand '%s' gevonden "
+msgstr "Kan spiegelbestand '%s' niet lezen"
#: methods/mirror.cc:315
-#, fuzzy, c-format
+#, c-format
msgid "No entry found in mirror file '%s'"
-msgstr "Geen spiegelbestand '%s' gevonden "
+msgstr "Geen vermelding gevonden in spiegelbestand '%s'"
#: methods/mirror.cc:445
#, c-format
@@ -1826,20 +1895,21 @@ msgstr "worden geconfigureerd. Hierbij kunnen fouten meerdere malen optreden"
#: dselect/install:104
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"
+"of veroorzaakt worden door niet-voldane vereisten. Dit is O.K., enkel de "
+"fouten"
#: dselect/install:105
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
-"boven dit bericht zijn belangrijk. U dient ze op te lossen en de installatie "
-"opnieuw uit te voeren"
+"boven dit bericht zijn belangrijk. U dient ze op te lossen en de opdracht "
+"[I]nstall opnieuw uit te voeren"
#: dselect/update:30
msgid "Merging available information"
msgstr "De beschikbare informatie wordt samengevoegd"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1854,56 +1924,55 @@ msgid ""
msgstr ""
"Gebruik: apt-extracttemplates bestand1 [bestand2 ...]\n"
"\n"
-"apt-extracttemplates is een programma om configuratie- en "
-"sjablooninformatie\n"
-"uit Debian pakketten te halen.\n"
+"apt-extracttemplates is een hulpmiddel om configuratie- en "
+"sjablooninformatie uit Debian pakketten te halen.\n"
"\n"
"Opties:\n"
-" -h Deze hulptekst.\n"
-" -t Stel de tijdelijke map in.\n"
-" -c=? Lees dit configuratiebestand.\n"
+" -h Deze hulptekst\n"
+" -t Stel de tijdelijke map in\n"
+" -c=? Lees dit configuratiebestand\n"
" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
-#, fuzzy, c-format
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, c-format
msgid "Unable to mkstemp %s"
-msgstr "Kan de status van %s niet opvragen"
+msgstr "Kan tijdelijk bestand %s niet aanmaken"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Kan niet naar %s schrijven"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Kan versie van debconf niet bepalen. Is debconf geïnstalleerd?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Pakket-extensielijst is te lang"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Fout bij het verwerken van map %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Bron-extensielijst is te lang"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
-msgstr "Fout bij wegschrijven van de koptekst naar het 'contents'-bestand"
+msgstr "Fout bij het wegschrijven van de koptekst naar het inhoudsbestand"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Fout bij het verwerken van de inhoud van %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1944,7 +2013,7 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option"
msgstr ""
-"Gebruik: apt-ftparchive [opties] commando\n"
+"Gebruik: apt-ftparchive [opties] opdracht\n"
"Opdrachten: packages <pad naar .deb's> [voorrangsbestand [padprefix]]\n"
" sources <pad naar .dsc's> [voorrangsbestand [padprefix]]\n"
" contents <pad>\n"
@@ -1952,14 +2021,14 @@ msgstr ""
" generate config [groepen]\n"
" clean config\n"
"\n"
-"Met apt-ftparchive genereert u index bestanden voor Debian archieven.\n"
-"Het ondersteunt verschillende generatiestijlen variërend van volledig \n"
+"Met apt-ftparchive genereert index bestanden voor Debian archieven.\n"
+"Het ondersteunt verschillende aanmaakstijlen variërend van volledig \n"
"automatisch tot een functionele vervanging van dpkg-scanpackages en \n"
"dpkg-scansources\n"
"\n"
"apt-ftparchive genereert pakketbestanden van een boom met .debs.\n"
-"Het 'Packages'-bestand bevat de inhoud van alle 'control'-velden van elk\n"
-"pakket alsook de MD5 hash en de bestandsgrootte. Via een voorrangsbestand\n"
+"Het bestand Package bevat de inhoud van alle 'control'-velden van elk\n"
+"pakket alsook de MD5-hash en de bestandsgrootte. Via een voorrangsbestand\n"
"kunnen de waardes van de 'Priority'- en 'Section'-velden afgedwongen\n"
"worden.\n"
"\n"
@@ -1968,30 +2037,30 @@ msgstr ""
"om een voorrangsbestand voor bronpakketten te specificeren.\n"
"\n"
"De 'packages' en 'sources' opdrachten dienen uitgevoerd te worden \n"
-"in de basismap van de boom. Het pad naar de .deb's dient te verwijzen naar\n"
-"het startpunt van de recursieve zoekopdracht en een voorrangsbestand dient\n"
-"de voorrangsvlaggen te bevatten. Padprefix wordt toegevoegd aan het\n"
-"'filename'-veld indien dit aanwezig is. Enkele voorbeelden uit het debian\n"
-"archief:\n"
-" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-" dists/potato/main/binary-i386/Packages\n"
+"in de basismap van de boom. Het pad naar de .deb's dient te verwijzen\n"
+"naar het startpunt van de recursieve zoekopdracht en een voorrangsbestand\n"
+"dient de voorrangsvlaggen te bevatten. Padprefix wordt toegevoegd\n"
+"aan het 'filename'-veld indien dit aanwezig is. Een praktijkvoorbeeld\n"
+"uit het Debian-archief:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
"\n"
"Opties:\n"
" -h Deze hulptekst\n"
-" --md5 Beheer de MD5 generatie\n"
+" --md5 Beheer het aanmaken van de MD5\n"
" -s=? Bronvoorrangsbestand\n"
" -q Stille uitvoer\n"
" -d=? Selecteert de optionele caching database\n"
-" --no-delink Schakelt de ontlinking debug modus in\n"
-" --contents Beheer de generatie van het inhoudsbestand\n"
+" --no-delink Schakelt de debug-modus voor delinking in\n"
+" --contents Beheer het aanmaken van het inhoudsbestand\n"
" -c=? Lees dit configuratiebestand in\n"
" -o=? Stel een willekeurige configuratie optie in"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Geen van de selecties kwam overeen"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Sommige bestanden zijn niet aanwezig in de pakketbestandsgroep '%s'"
@@ -2023,12 +2092,11 @@ msgstr "Kan het DB-bestand %s niet openen: %s"
#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
-msgstr "stat op %s is mislukt"
+msgstr "Opvragen van de status van %s is mislukt"
#: ftparchive/cachedb.cc:326
-#, fuzzy
msgid "Failed to read .dsc"
-msgstr "readlink op %s is mislukt"
+msgstr "Lezen van .dsc is mislukt"
#: ftparchive/cachedb.cc:359
msgid "Archive has no control record"
@@ -2077,48 +2145,48 @@ msgstr "Openen van %s is mislukt"
#: ftparchive/writer.cc:291
#, c-format
msgid " DeLink %s [%s]\n"
-msgstr " OntlLink %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
#: ftparchive/writer.cc:299
#, c-format
msgid "Failed to readlink %s"
-msgstr "readlink op %s is mislukt"
+msgstr "Opdracht readlink %s is mislukt"
#: ftparchive/writer.cc:303
#, c-format
msgid "Failed to unlink %s"
-msgstr "Ontlinken van %s is mislukt"
+msgstr "Ontkoppelen van %s is mislukt"
#: ftparchive/writer.cc:311
#, c-format
msgid "*** Failed to link %s to %s"
-msgstr "*** Linken van %s aan %s is mislukt"
+msgstr "*** Koppelen van %s aan %s is mislukt"
#: ftparchive/writer.cc:321
#, c-format
msgid " DeLink limit of %sB hit.\n"
-msgstr " Ontlinklimiet van %sB bereikt.\n"
+msgstr " DeLink-limiet van %sB bereikt.\n"
#: ftparchive/writer.cc:427
msgid "Archive had no package field"
msgstr "Archief heeft geen 'package'-veld"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s heeft geen voorrangsingang\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s beheerder is %s, niet %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s heeft geen voorrangsingang voor bronpakketten\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n"
@@ -2135,9 +2203,9 @@ msgstr "Kan %s niet openen"
#. skip spaces
#. find end of word
#: ftparchive/override.cc:68
-#, fuzzy, c-format
+#, c-format
msgid "Malformed override %s line %llu (%s)"
-msgstr "Misvormde voorrangsingang %s op regel %lu #1"
+msgstr "Niet juist gevormde voorrangsingang %s op regel %llu (%s)"
#: ftparchive/override.cc:127 ftparchive/override.cc:201
#, c-format
@@ -2145,19 +2213,19 @@ msgid "Failed to read the override file %s"
msgstr "Lezen van het voorrangsbestand %s is mislukt"
#: ftparchive/override.cc:166
-#, fuzzy, c-format
+#, c-format
msgid "Malformed override %s line %llu #1"
-msgstr "Misvormde voorrangsingang %s op regel %lu #1"
+msgstr "Niet juist gevormde voorrangsingang %s op regel %llu #1"
#: ftparchive/override.cc:178
-#, fuzzy, c-format
+#, c-format
msgid "Malformed override %s line %llu #2"
-msgstr "Misvormde voorrangsingang %s op regel %lu #2"
+msgstr "Niet juist gevormde voorrangsingang %s op regel %llu #2"
#: ftparchive/override.cc:191
-#, fuzzy, c-format
+#, c-format
msgid "Malformed override %s line %llu #3"
-msgstr "Misvormde voorrangsingang %s op regel %lu #3"
+msgstr "Niet juist gevormde voorrangsingang %s op regel %llu #3"
#: ftparchive/multicompress.cc:73
#, c-format
@@ -2167,7 +2235,7 @@ msgstr "Onbekend compressie-algoritme '%s'"
#: ftparchive/multicompress.cc:103
#, c-format
msgid "Compressed output %s needs a compression set"
-msgstr "Gecomprimeerde uitvoer %s vereist een compressieset"
+msgstr "Gecomprimeerde uitvoer %s vereist dat een compressie ingesteld is"
#: ftparchive/multicompress.cc:192
msgid "Failed to create FILE*"
@@ -2197,15 +2265,14 @@ msgstr "Lezen tijdens het berekenen van de MD5 is mislukt"
#: ftparchive/multicompress.cc:359
#, c-format
msgid "Problem unlinking %s"
-msgstr "Probleem bij het ontlinken van %s"
+msgstr "Probleem bij het ontkoppelen van %s"
#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Hernoemen van %s naar %s is mislukt"
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2218,23 +2285,22 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Gebruik: apt-extracttemplates bestand1 [bestand2 ...]\n"
+"Gebruik: apt-internal-solver\n"
"\n"
-"apt-extracttemplates is een programma om configuratie- en "
-"sjablooninformatie\n"
-"uit Debian pakketten te halen.\n"
+"apt--internal-solver is een interface om voor de APT-familie de actuele\n"
+"interne oplosser als een externe te gebruiken voor debugging e.d.\n"
"\n"
"Opties:\n"
-" -h Deze hulptekst.\n"
-" -t Stel de tijdelijke map in.\n"
-" -c=? Lees dit configuratiebestand.\n"
+" -h Deze hulptekst.\n"
+" -t Logbare uitvoer - geen voortgangsaanduiding\n"
+" -c=? Lees dit configuratiebestand\n"
" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Onbekend pakketrecord!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2249,19 +2315,19 @@ msgid ""
msgstr ""
"Gebruik: apt-sortpkgs [opties] bestand1 [bestand2 ...]\n"
"\n"
-"apt-sortpkgs is een simpel programma om pakketbestanden te sorteren.\n"
+"apt-sortpkgs is een simpel hulpmiddel om pakketbestanden te sorteren.\n"
"De -s optie wordt gebruikt om aan te geven om welk soort bestand het gaat.\n"
"\n"
"Opties:\n"
-" -h Deze helptekst\n"
-" -s Sorteer bronbestanden\n"
+" -h Deze hulptekst\n"
+" -s Sorteer bronbestanden\n"
" -c=? Lees dit configuratiebestand\n"
" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
#: apt-pkg/install-progress.cc:59
#, c-format
msgid "Progress: [%3i%%]"
-msgstr ""
+msgstr "Voortgang: [%3i%%]"
#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
msgid "Running dpkg"
@@ -2274,7 +2340,7 @@ msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund"
#: apt-pkg/init.cc:172
msgid "Unable to determine a suitable packaging system type"
-msgstr "Kan geen geschikt pakketsysteemtype bepalen"
+msgstr "Kan geen geschikt pakketbeheersysteemtype bepalen"
#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
#, c-format
@@ -2284,30 +2350,52 @@ msgstr "%i records weggeschreven.\n"
#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
#, c-format
msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i records weggeschreven met %i missende bestanden.\n"
+msgstr "%i records weggeschreven met %i ontbrekende bestanden.\n"
#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n"
+msgstr "%i records weggeschreven met %i niet-overeenstemmende bestanden\n"
#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
#, 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"
+"%i records weggeschreven met %i ontbrekende bestanden en %i niet-"
+"overeenstemmende bestanden\n"
#: apt-pkg/indexcopy.cc:515
#, c-format
msgid "Can't find authentication record for: %s"
-msgstr "Kan geen authenticatierecord vinden voor: %s"
+msgstr "Kan geen authenticiteitsrecord vinden voor: %s"
#: apt-pkg/indexcopy.cc:521
#, c-format
msgid "Hash mismatch for: %s"
msgstr "Hash-som komt niet overeen voor: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
+
+#: apt-pkg/acquire-worker.cc:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "Is het pakket %s geïnstalleerd?"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Methode %s startte niet op de juiste manier"
+
+#: apt-pkg/acquire-worker.cc:485
+#, 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/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2323,178 +2411,308 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "De lijst van bronnen kon niet gelezen worden."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Lege pakketcache"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Het pakketcachebestand is beschadigd"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Het pakketcachebestand heeft een niet-compatibele versie"
-#: apt-pkg/pkgcache.cc:163
-#, fuzzy
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
-msgstr "Het pakketcachebestand is beschadigd"
+msgstr "Het pakketcachebestand is beschadigd. Het is te klein"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Deze APT ondersteunt het versienummeringssysteem '%s' niet"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "De pakketcache was aangemaakt voor een andere architectuur"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Vereisten"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Voor-Vereisten"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Suggesties"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Aanbevelingen"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Conflicteert met"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Vervangt"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
-msgstr "Verouderd"
+msgstr "Doet in onbruik geraken"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Breekt"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Vult aan"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "belangrijk"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "noodzakelijk"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "standaard"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "optioneel"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "extra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Opwaardering wordt doorgerekend"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Het methodestuurprogramma %s kon niet gevonden worden."
+msgid "Index file type '%s' is not supported"
+msgstr "Indexbestand van type '%s' wordt niet ondersteund"
-#: apt-pkg/acquire-worker.cc:135
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n"
+#: apt-pkg/sourcelist.cc:127
+#, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Niet juist gevormd element %lu in bronlijst %s (URI-verwerking)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Methode %s startte niet op de juiste manier"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Niet juist gevormde regel %lu in bronlijst %s ([optie] onbegrijpelijk)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Niet juist gevormde regel %lu in bronlijst %s ([optie] te kort)"
+
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-"Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op "
-"'enter' te drukken."
+"Niet juist gevormde regel %lu in bronlijst %s ([%s] is geen toekenning)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:190
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexbestand van type '%s' wordt niet ondersteund"
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+"Niet juist gevormde regel %lu in bronlijst %s ([%s] heeft geen sleutel)"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Boom van vereisten wordt opgebouwd"
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Niet juist gevormde regel %lu in bronlijst %s ([%s] sleutel %s heeft geen "
+"waarde)"
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidaat-versies"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Niet juist gevormde regel %lu in bronlijst %s (URI)"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generatie vereisten"
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Niet juist gevormde regel %lu in bronlijst %s (dist)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "De status informatie wordt gelezen"
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Niet juist gevormde regel %lu in bronlijst %s (URI-verwerking)"
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:217
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Openen van StateFile %s is mislukt"
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Niet juist gevormde regel %lu in bronlijst %s (absolute dist)"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:224
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt"
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Niet juist gevormde regel %lu in bronlijst %s (ontleding van dist)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s wordt geopend"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, 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:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Niet juist gevormde regel %u in bronlijst %s (type)"
+
+#: apt-pkg/sourcelist.cc:375
+#, 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:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Type '%s' van element %u in bronlijst %s is onbekend"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr "Opschonen van %s wordt niet ondersteund"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Kan de status van %s niet opvragen."
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Cache heeft een niet-compatibel versienummeringssysteem"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Fout tijdens verwerken van %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Wauw, u heeft het maximum aantal pakketnamen dat deze APT aankan "
+"overschreden."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"Wauw, u heeft het maximum aantal versies dat deze APT aankan overschreden."
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Wauw, u heeft het maximum aantal beschrijvingen dat deze APT aankan "
+"overschreden."
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Wauw, u heeft het maximum aantal afhankelijkheden dat deze APT aankan "
+"overschreden."
+
+#: apt-pkg/pkgcachegen.cc:591
+#, 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:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Pakketlijsten worden ingelezen"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Voorziene bestanden worden verzameld"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bron-cache"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Scenario naar de oplosser sturen"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Verzoek naar de oplosser sturen"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Instellen op het ontvangen van een oplossing"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "Externe oplosser faalde zonder passende foutmelding"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "Externe oplosser uitvoeren"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
-msgstr "herbenoeming is mislukt, %s (%s -> %s)."
+msgstr "het hernoemen is mislukt, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Hash-som komt niet overeen"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Grootte komt niet overeen"
-#: apt-pkg/acquire-item.cc:255
-#, fuzzy
+#: apt-pkg/acquire-item.cc:250
msgid "Invalid file format"
-msgstr "Ongeldige operatie %s"
+msgstr "Ongeldig bestandsformaat"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Schrijffout"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2505,7 +2723,7 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fout: %s: %s"
@@ -2521,64 +2739,68 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
+"Kon de verwachte regel '%s' in het Release-bestand niet vinden (Foute regel "
+"in het bestand sources.list of bestand in een ongeldig formaat)"
-#: apt-pkg/acquire-item.cc:1971
-#, fuzzy, c-format
+#: apt-pkg/acquire-item.cc:1975
+#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Kon Release-bestand %s niet ontleden"
+msgstr "Kon de hash-som voor '%s' niet vinden in het Release-bestand"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
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"
+"Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-ID's:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
+"Het Release-bestand voor %s is vervallen (ongeldig sinds %s). Bijwerkingen "
+"voor deze pakketbron zullen niet uitgevoerd worden."
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, 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 ""
"Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u "
-"dit pakket handmatig moet repareren (wegens missende architectuur)"
+"dit pakket handmatig moet repareren (wegens ontbrekende architectuur)"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+msgstr "Kan geen bron vinden om versie '%s' van '%s' op te halen"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2586,131 +2808,58 @@ msgstr ""
"De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
"pakket %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Cache heeft een niet-compatibel versienummeringssysteem"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Fout tijdens verwerken van %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Wauw, u heeft meer pakketten dan deze APT aan kan."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Wauw, u heeft meer versies dan deze APT aan kan."
-
-#: apt-pkg/pkgcachegen.cc:279
-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:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aan kan."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, 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:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kon de status van de bronpakketlijst %s niet opvragen"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Pakketlijsten worden ingelezen"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Voorziene bestanden worden verzameld"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
-msgstr "Verkopersblok %s bevat geen vingerafdruk"
+msgstr "Leveranciersblok %s bevat geen vingerafdruk"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Lijstmap %spartial is afwezig."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Archiefmap %spartial is afwezig."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Indexbestand van type '%s' wordt niet ondersteund"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "Kan de map %s niet vergrendelen"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, 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:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Bestand %li van %li wordt opgehaald"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-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/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
"Uw bronnenlijst (/etc/apt/sources.list) dient tenminste één bron-URI te "
"bevatten"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kan de status van %s niet opvragen."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
"The value '%s' is invalid for APT::Default-Release as such a release is not "
"available in the sources"
msgstr ""
+"Een waarde '%s' voor APT::Default-Release is ongeldig, aangezien een "
+"dergelijke uitgave niet voorkomt in de bronnen"
#: apt-pkg/policy.cc:422
#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
-"Ongeldige record in het voorkeurenbestand %s, 'Package' koptekst ontbreekt"
+"Ongeldig record in het voorkeurenbestand %s, 'Package'-koptekst ontbreekt"
#: apt-pkg/policy.cc:444
#, c-format
@@ -2721,7 +2870,7 @@ msgstr "Pintype %s wordt niet begrepen"
msgid "No priority (or zero) specified for pin"
msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2730,12 +2879,12 @@ msgstr ""
"Kon onmiddellijke configuratie van '%s' niet uitvoeren. Voor details zie "
"'man 5 apt.conf', onder APT::Immediate-Configure. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
-#, fuzzy, c-format
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
+#, c-format
msgid "Could not configure '%s'. "
-msgstr "Kon het bestand '%s' niet openen"
+msgstr "Kon '%s' niet configureren. "
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2743,23 +2892,26 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
"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."
+"essentiële pakket %s omwille van een Conflicts/Pre-Depends-lus. Dit is vaak "
+"slecht, maar als u dit echt wilt doen, dan dient u de optie APT::Force-"
+"LoopBreak te activeren."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Regel %u van de bronlijst %s is te lang."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+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/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
-msgstr "CD wordt afgekoppeld...\n"
+msgstr "Cd-rom wordt afgekoppeld...\n"
#: apt-pkg/cdrom.cc:586
#, c-format
msgid "Using CD-ROM mount point %s\n"
-msgstr "Er wordt gebruik gemaakt van CD-aankoppelpunt %s\n"
+msgstr "Er wordt gebruik gemaakt van cd-romaankoppelpunt %s\n"
#: apt-pkg/cdrom.cc:599
msgid "Waiting for disc...\n"
@@ -2767,7 +2919,7 @@ msgstr "Er wordt gewacht op de schijf...\n"
#: apt-pkg/cdrom.cc:609
msgid "Mounting CD-ROM...\n"
-msgstr "CD wordt aangekoppeld...\n"
+msgstr "Cd-rom wordt aangekoppeld...\n"
#: apt-pkg/cdrom.cc:620
msgid "Identifying... "
@@ -2780,7 +2932,7 @@ msgstr "Opgeslagen label: %s \n"
#: apt-pkg/cdrom.cc:680
msgid "Scanning disc for index files...\n"
-msgstr "Er wordt gescand voor indexbestanden...\n"
+msgstr "De schijf wordt gescand op indexbestanden...\n"
#: apt-pkg/cdrom.cc:734
#, c-format
@@ -2796,8 +2948,8 @@ msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-"Kan geen Package-bestanden vinden. Is dit mogelijk geen Debian schijf, of de "
-"verkeerde architectuur?"
+"Kan geen Package-bestanden vinden. Is dit misschien geen Debian schijf, of "
+"de verkeerde architectuur?"
#: apt-pkg/cdrom.cc:771
#, c-format
@@ -2806,7 +2958,7 @@ msgstr "Label '%s' gevonden\n"
#: apt-pkg/cdrom.cc:800
msgid "That is not a valid name, try again.\n"
-msgstr "Dat is een ongeldige naam, gelieve opnieuw te proberen.\n"
+msgstr "Dat is een ongeldige naam. Gelieve opnieuw te proberen.\n"
#: apt-pkg/cdrom.cc:817
#, c-format
@@ -2814,20 +2966,20 @@ msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-"De schijf heet:\n"
+"Deze schijf heet:\n"
"'%s'\n"
#: apt-pkg/cdrom.cc:819
msgid "Copying package lists..."
msgstr "Pakketlijsten worden gekopieerd..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Nieuwe bronlijst wordt weggeschreven\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
-msgstr "Bronlijst-ingangen voor de schijf zijn:\n"
+msgstr "Bronlijst-elementen voor deze schijf zijn:\n"
#: apt-pkg/algorithms.cc:265
#, c-format
@@ -2837,148 +2989,48 @@ msgstr ""
"Pakket %s moet opnieuw geïnstalleerd worden, maar er kan geen archief voor "
"gevonden worden."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-"Fout, pkgProblemResolver::Resolve maakte scheidingen aan, dit kan "
-"veroorzaakt worden door vastgehouden pakketten."
+"Fout, pkgProblemResolver::Resolve leverde defecten op. Dit kan veroorzaakt "
+"worden door vastgehouden pakketten."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Kon pakketbestand %s niet ontleden (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Kon pakketbestand %s niet ontleden (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Kon Release-bestand %s niet ontleden"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Geen secties in Release-bestand %s"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Geen Hash-vermelding in Release-bestand %s"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Geen 'Valid-Until'-vermelding in Release-bestand %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Geen 'Date'-vermelding in Release-bestand %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Misvormde regel %lu in bronlijst %s (URI parse)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Misvormde regel %lu in bronlijst %s ([optie] onbegrijpelijk)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Misvormde regel %lu in bronlijst %s ([optie] te kort)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Misvormde regel %lu in bronlijst %s ([%s] is geen toekenning)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Misvormde regel %lu in bronlijst %s ([%s] heeft geen sleutel)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Misvormde regel %lu in bronlijst %s ([%s] sleutel %s heeft geen waarde)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Misvormde regel %lu in bronlijst %s (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Misvormde regel %lu in bronlijst %s (dist)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Boom van vereisten wordt opgebouwd"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Misvormde regel %lu in bronlijst %s (URI parse)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidaat-versies"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Genereren van vereisten"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Misvormde regel %lu in bronlijst %s (dist parse)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "De statusinformatie wordt gelezen"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "%s wordt geopend"
+msgid "Failed to open StateFile %s"
+msgstr "Openen van StateFile %s is mislukt"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Misvormde regel %u in bronlijst %s (type)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Wegschrijven van tijdelijke StateFile %s is mislukt"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, 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:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Type '%s' op regel %u in bronlijst %s is onbekend"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Kon pakketbestand %s niet ontleden (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2990,233 +3042,110 @@ msgstr "Release '%s' voor '%s' is niet gevonden"
msgid "Version '%s' for '%s' was not found"
msgstr "Versie '%s' voor '%s' is niet gevonden"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Kon taak '%s' niet vinden"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
-msgstr "Kon geen enkel pakket vinden bij regex '%s'"
+msgstr "Kon geen enkel pakket vinden via regex '%s'"
-#: apt-pkg/cacheset.cc:646
-#, fuzzy, c-format
+#: apt-pkg/cacheset.cc:641
+#, c-format
msgid "Couldn't find any package by glob '%s'"
-msgstr "Kon geen enkel pakket vinden bij regex '%s'"
+msgstr "Kon geen enkel pakket vinden via glob '%s'"
-#: apt-pkg/cacheset.cc:690
-#, fuzzy, c-format
+#: apt-pkg/cacheset.cc:680
+#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-"Kan geen versies selecteren voor pakket '%s' omdat deze zuiver virtueel is"
+"Kan geen versies selecteren voor pakket '%s' omdat het puur virtueel is"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-"Kan de nieuwste versie van het pakket '%s' niet selecteren omdat deze zuiver "
+"Kan de nieuwste versie van het pakket '%s' niet selecteren omdat het puur "
"virtueel is"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-"Kan de kandidaat-versie van het pakket %s niet selecteren omdat deze geen "
+"Kan de kandidaat-versie van het pakket %s niet selecteren omdat het geen "
"kandidaat heeft"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-"Kan de geïnstalleerde versie van het pakket %s niet selecteren omdat deze "
+"Kan de geïnstalleerde versie van het pakket %s niet selecteren omdat het "
"niet geïnstalleerd is"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
"Kan noch de geïnstalleerde, noch de kandidaat-versie van het pakket '%s' "
-"selecteren omdat deze geen van beide heeft"
-
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "%s wordt geïnstalleerd"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "%s wordt geconfigureerd"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "%s wordt verwijderd"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "%s wordt volledig verwijderd"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "De verdwijning van %s wordt opgemerkt"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Post-installatie-trigger %s wordt uitgevoerd"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Map '%s' ontbreekt"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Kon het bestand '%s' niet openen"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "%s wordt voorbereid"
+"selecteren omdat geen van beide er zijn"
-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Unpacking %s"
-msgstr "%s wordt uitgepakt"
+msgid "Unable to parse Release file %s"
+msgstr "Kon Release-bestand %s niet ontleden"
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Preparing to configure %s"
-msgstr "Configuratie van %s wordt voorbereid"
+msgid "No sections in Release file %s"
+msgstr "Geen secties in Release-bestand %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Installed %s"
-msgstr "%s is geïnstalleerd"
+msgid "No Hash entry in Release file %s"
+msgstr "Geen Hash-vermelding in Release-bestand %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Verwijdering van %s wordt voorbereid"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ongeldige 'Valid-Until'-vermelding in Release-bestand %s"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Removed %s"
-msgstr "%s is verwijderd"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ongeldige 'Date'-vermelding in Release-bestand %s"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Volledige verwijdering van %s wordt voorbereid"
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %liu %limin %lis"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Completely removed %s"
-msgstr "%s is volledig verwijderd"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Kan niet naar %s schrijven"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-"Er is geen apport-verslag weggeschreven omdat het maximum aantal verslagen "
-"(MaxReports) al is bereikt"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "problemen met vereisten - wordt niet geconfigureerd"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Er is geen apport-verslag weggeschreven omdat de foutmelding volgt op een "
-"eerdere mislukking."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
-"over een volle schijf."
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
-"over onvoldoende-geheugen."
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is "
-"over een volle schijf."
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout over "
-"dpkg-I/O is."
+msgid "%lih %limin %lis"
+msgstr "%liu %limin %lis"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Kan de beheersmap (%s) niet vergrendelen. Is deze in gebruik door een ander "
-"proces?"
+msgid "%limin %lis"
+msgstr "%limin %lis"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Kan de beheersmap (%s) niet vergrendelen. Heeft u beheerdersrechten?"
+msgid "%lis"
+msgstr "%lis"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"dpkg werd onderbroken; voer handmatig '%s' uit om het probleem te verhelpen. "
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Niet vergrendeld"
+msgid "Selection %s not found"
+msgstr "Selectie %s niet gevonden"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3228,7 +3157,7 @@ msgstr ""
#: apt-pkg/contrib/fileutl.cc:201
#, c-format
msgid "Could not open lock file %s"
-msgstr "Kon het vergrendelingsbestand '%s' niet openen"
+msgstr "Kon het vergrendelingsbestand %s niet openen"
#: apt-pkg/contrib/fileutl.cc:224
#, c-format
@@ -3244,23 +3173,26 @@ msgstr "Kon vergrendeling %s niet verkrijgen"
#: apt-pkg/contrib/fileutl.cc:366 apt-pkg/contrib/fileutl.cc:480
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgstr "Bestandenlijst kan niet aangemaakt worden, omdat '%s' geen map is"
#: apt-pkg/contrib/fileutl.cc:400
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgstr "Negeren van '%s' in map '%s' omdat het geen gewoon bestand is"
#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
msgstr ""
+"Negeren van bestand '%s' in map '%s' omdat het geen bestandsextensie heeft"
#: apt-pkg/contrib/fileutl.cc:427
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
+"Negeren van bestand '%s' in map '%s' omdat het een ongeldige "
+"bestandsextensie heeft"
#: apt-pkg/contrib/fileutl.cc:846
#, c-format
@@ -3275,7 +3207,7 @@ msgstr "Subproces %s ontving signaal %u."
#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
#, c-format
msgid "Sub-process %s returned an error code (%u)"
-msgstr "Subproces %s gaf de foutcode %u terug"
+msgstr "Subproces %s gaf een foutcode terug (%u)"
#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
#, c-format
@@ -3285,7 +3217,7 @@ msgstr "Subproces %s sloot onverwacht af"
#: apt-pkg/contrib/fileutl.cc:952
#, c-format
msgid "Problem closing the gzip file %s"
-msgstr "Probleem bij het afsluiten van het gzip-bestand %s"
+msgstr "Probleem bij het sluiten van het gzip-bestand %s"
#: apt-pkg/contrib/fileutl.cc:1140
#, c-format
@@ -3299,36 +3231,36 @@ msgstr "Kon de bestandsindicator %d niet openen"
#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
msgid "Failed to create subprocess IPC"
-msgstr "Aanmaken subproces-IPC is mislukt"
+msgstr "Aanmaken IPC-subproces is mislukt"
#: apt-pkg/contrib/fileutl.cc:1412
msgid "Failed to exec compressor "
msgstr "Uitvoeren van de compressor is mislukt "
#: apt-pkg/contrib/fileutl.cc:1553
-#, fuzzy, c-format
+#, c-format
msgid "read, still have %llu to read but none left"
-msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar"
+msgstr "lezen; moet er nog %lu lezen, maar er schieten er geen meer over"
#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
-#, fuzzy, c-format
+#, c-format
msgid "write, still have %llu to write but couldn't"
-msgstr "schrijf, de laatste %lu konden niet weggeschreven worden"
+msgstr "schrijven; de laatste %lu konden niet weggeschreven worden"
#: apt-pkg/contrib/fileutl.cc:1954
#, c-format
msgid "Problem closing the file %s"
-msgstr "Probleem bij het afsluiten van het bestand %s"
+msgstr "Probleem bij het sluiten van het bestand %s"
#: apt-pkg/contrib/fileutl.cc:1965
#, c-format
msgid "Problem renaming the file %s to %s"
-msgstr "Probleem bij het hernoemen van '%s' naar '%s'"
+msgstr "Probleem bij het hernoemen van het bestand %s naar %s"
#: apt-pkg/contrib/fileutl.cc:1976
#, c-format
msgid "Problem unlinking the file %s"
-msgstr "Probleem bij het ontlinken van het bestand %s"
+msgstr "Probleem bij het ontkoppelen van het bestand %s"
#: apt-pkg/contrib/fileutl.cc:1989
msgid "Problem syncing the file"
@@ -3346,46 +3278,17 @@ msgstr "%c%s... Klaar"
#: apt-pkg/contrib/progress.cc:181
msgid "..."
-msgstr ""
+msgstr "..."
#. Print the spinner
#: apt-pkg/contrib/progress.cc:197
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Klaar"
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %liu %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liu %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Selectie %s niet gevonden"
+msgid "%c%s... %u%%"
+msgstr "%c%s... %u%%"
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
-msgstr "Kan een leeg bestand niet mmappen"
+msgstr "Kan systeem-aanroep mmap niet op een leeg bestand toepassen"
#: apt-pkg/contrib/mmap.cc:111
#, c-format
@@ -3393,22 +3296,22 @@ msgid "Couldn't duplicate file descriptor %i"
msgstr "Kon de bestandsindicator %i niet dupliceren"
#: apt-pkg/contrib/mmap.cc:119
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't make mmap of %llu bytes"
-msgstr "Kon van %lu bytes geen mmap maken"
+msgstr "Kon het omslaan naar het geheugen van %llu bytes niet uitvoeren"
#: apt-pkg/contrib/mmap.cc:146
msgid "Unable to close mmap"
-msgstr "Kan mmap niet sluiten"
+msgstr "Kan de 'mmap' niet sluiten"
#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
msgid "Unable to synchronize mmap"
-msgstr "Kan mmap niet synchronizeren"
+msgstr "Kan de 'mmap' niet synchronizeren"
#: apt-pkg/contrib/mmap.cc:290
#, c-format
msgid "Couldn't make mmap of %lu bytes"
-msgstr "Kon van %lu bytes geen mmap maken"
+msgstr "Kon het omslaan naar het geheugen van %lu bytes niet uitvoeren"
#: apt-pkg/contrib/mmap.cc:322
msgid "Failed to truncate file"
@@ -3430,7 +3333,7 @@ msgid ""
"reached."
msgstr ""
"Kan het formaat van de MMap niet vergroten omdat de grens van %lu bytes al "
-"is bereikt"
+"is bereikt."
#: apt-pkg/contrib/mmap.cc:449
msgid ""
@@ -3446,121 +3349,293 @@ msgstr "Kan de status van het aanhechtpunt %s niet opvragen"
#: apt-pkg/contrib/cdromutl.cc:246
msgid "Failed to stat the cdrom"
-msgstr "stat op de CD-ROM is mislukt"
+msgstr "Opvragen van de status van de cd-rom is mislukt"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Onbekende type-afkorting '%c'"
+msgstr "Onbekende type-afkorting: '%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Configuratiebestand %s wordt geopend"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Syntaxfout %s:%u: Blok start zonder naam."
+msgstr "Syntactische fout %s:%u: blok start zonder naam."
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Syntaxfout %s:%u: Verkeerd gevormde markering"
+msgstr "Syntactische fout %s:%u: verkeerd gevormde markering"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Syntaxfout %s:%u: Extra rommel na waarde"
+msgstr "Syntactische fout %s:%u: extra rommel na waarde"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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"
+"Syntactische fout %s:%u: richtlijnen kunnen enkel op het hoogste niveau "
+"gegeven worden"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Syntaxfout %s:%u: Teveel geneste invoegingen"
+msgstr "Syntactische fout %s:%u: teveel geneste invoegingen"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntaxfout %s:%u: Vanaf hier ingevoegd"
+msgstr "Syntactische fout %s:%u: vanaf hier ingevoegd"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'"
+msgstr "Syntactische fout %s:%u: niet-ondersteunde richtlijn '%s'"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
-"Syntaxfout %s:%u: De richtlijn 'clear' vereist een optieboom als argument"
+"Syntactische fout %s:%u: de richtlijn 'clear' vereist een optieboom als "
+"argument"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, 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"
+msgstr "Syntactische fout %s:%u: extra rommel aan het einde van het bestand"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, 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:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Commandoregel-optie %s wordt niet begrepen"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Commandoregel-optie %s is niet booleaans"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Optie %s vereist een argument."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
-"Optie %s: De specificatie van het configuratie-item dient een =<waarde> te "
+"Optie %s: de specificatie van het configuratie-item dient een =<waarde> te "
"bevatten."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Optie %s vereist een integer getal als argument, niet '%s'"
+msgstr "Optie %s vereist een geheel getal als argument, niet '%s'"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Optie '%s' is te lang"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
-msgstr "Waarde %s wordt niet begrepen, probeer 'true' of 'false'."
+msgstr "Betekenis van %s wordt niet begrepen, probeer 'true' of 'false'."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
-msgstr "Ongeldige operatie %s"
+msgstr "Ongeldige bewerking %s"
+
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "%s wordt geïnstalleerd"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "%s wordt geconfigureerd"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "%s wordt verwijderd"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "%s wordt volledig verwijderd"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "De verdwijning van %s wordt opgemerkt"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Post-installatie-trigger %s wordt uitgevoerd"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Map '%s' ontbreekt"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Kon het bestand '%s' niet openen"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "%s wordt voorbereid"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "%s wordt uitgepakt"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Configuratie van %s wordt voorbereid"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "%s is geïnstalleerd"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Verwijderen van %s wordt voorbereid"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "%s is verwijderd"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Volledig verwijderen van %s wordt voorbereid"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s is volledig verwijderd"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, c-format
+msgid "Can not write log (%s)"
+msgstr "Kan log (%s) niet opschrijven"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr "Is /dev/pts aangekoppeld?"
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "Bewerking werd afgebroken vooraleer ze beëindigd was"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+"Er is geen apport-verslag weggeschreven omdat het maximum aantal verslagen "
+"(MaxReports) al is bereikt"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "problemen met vereisten - wordt niet geconfigureerd"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Er is geen apport-verslag weggeschreven omdat de foutmelding aangeeft dat de "
+"fout het gevolg is van een eerdere mislukking."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Er is geen apport-verslag weggeschreven omdat de foutmelding als oorzaak een "
+"volle schijf opgeeft."
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Er is geen apport-verslag weggeschreven omdat de foutmelding als oorzaak "
+"onvoldoende-geheugen opgeeft."
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Er is geen apport-verslag weggeschreven omdat de foutmelding een probleem op "
+"het lokale systeem signaleert."
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout van "
+"dpkg I/O signaleert."
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Kan de beheersmap (%s) niet vergrendelen. Is deze in gebruik door een ander "
+"proces?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Kan de beheersmap (%s) niet vergrendelen. Heeft u beheerdersrechten?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"dpkg werd onderbroken; voer handmatig '%s' uit om het probleem te verhelpen. "
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Niet vergrendeld"
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
-msgstr "DropNode werd aangeroepen op een nog gelinkte knoop"
+msgstr "DropNode werd aangeroepen voor een nog steeds aangekoppeld punt"
#: apt-inst/filelist.cc:412
msgid "Failed to locate the hash element!"
-msgstr "Lokaliseren van het hash-element is mislukt!"
+msgstr "Situeren van het hash-element is mislukt!"
#: apt-inst/filelist.cc:459
msgid "Failed to allocate diversion"
@@ -3573,12 +3648,12 @@ msgstr "Interne fout in AddDiversion"
#: 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"
+msgstr "Er wordt gepoogd om de omleiding %s -> %s en %s/%s te overschrijven"
#: apt-inst/filelist.cc:506
#, c-format
msgid "Double add of diversion %s -> %s"
-msgstr "Dubbele toevoeging van de omleiding %s->%s"
+msgstr "Dubbele toevoeging van de omleiding %s -> %s"
#: apt-inst/filelist.cc:549
#, c-format
@@ -3603,7 +3678,7 @@ msgstr "De map %s is al omgeleid"
#: apt-inst/extract.cc:152
#, 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"
+msgstr "Het pakket probeert om weg te schrijven naar het omleidingsdoel %s/%s"
#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
msgid "The diversion path is too long"
@@ -3625,7 +3700,7 @@ msgstr "Het pad is te lang"
#: apt-inst/extract.cc:421
#, c-format
msgid "Overwrite package match with no version for %s"
-msgstr "Pakket-overeenkomst wordt overschreven met 'no version' voor %s"
+msgstr "Pakket-overeenkomst wordt overschreven zonder een versie voor %s"
#: apt-inst/extract.cc:438
#, c-format
@@ -3658,7 +3733,7 @@ msgstr "Dit is geen geldig DEB-archief, het onderdeel '%s' mankeert"
msgid "Internal error, could not locate member %s"
msgstr "Interne fout, kon onderdeel %s niet vinden"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Niet-ontleedbaar 'control'-bestand"
@@ -3673,7 +3748,7 @@ msgstr "Fout bij het lezen van de koptekst van het archiefonderdeel"
#: apt-inst/contrib/arfile.cc:96
#, c-format
msgid "Invalid archive member header %s"
-msgstr "Ongeldige koptekst voor archiefonderdeel: %s"
+msgstr "Ongeldige koptekst voor archiefonderdeel %s"
#: apt-inst/contrib/arfile.cc:108
msgid "Invalid archive member header"
@@ -3687,26 +3762,26 @@ msgstr "Archief is te kort"
msgid "Failed to read the archive headers"
msgstr "Lezen van de archiefkopteksten is mislukt"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
-msgstr "Aanmaken pijp is mislukt"
+msgstr "Aanmaken van pijpen is mislukt"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Uitvoeren van gzip is mislukt "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Beschadigd archief"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar controlesom klopt niet, het pakket is beschadigd"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
-msgstr "Onbekende TAR-kopteksttype %u, onderdeel %s"
+msgstr "Onbekend TAR-kopteksttype %u, onderdeel %s"
#~ msgid "Total dependency version space: "
#~ msgstr "Totale hoeveelheid vereisten-versieruimte: "
@@ -3720,6 +3795,9 @@ msgstr "Onbekende TAR-kopteksttype %u, onderdeel %s"
#~ msgid "No keyring installed in %s."
#~ msgstr "Geen sleutelring geïnstalleerd in %s."
+#~ msgid "Is stdout a terminal?"
+#~ msgstr "Is stdout een terminal?"
+
#, fuzzy
#~ msgid "Internal error, Upgrade broke stuff"
#~ msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
diff --git a/po/nn.po b/po/nn.po
index 7d6972d5d..0886c266a 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -25,148 +25,148 @@ msgstr ""
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:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Tal p pakkenamn: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid "Total package structures: "
msgstr "Tal p pakkenamn: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Vanlege pakkar: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Reine virtuelle pakkar: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Enkle virtuelle pakkar: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Samansette virtuelle pakkar: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Manglar: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Tal p einskildversjonar: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
#, fuzzy
msgid "Total distinct descriptions: "
msgstr "Tal p einskildversjonar: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Tal p krav: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Tal p ver./fil-forhold: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
#, fuzzy
msgid "Total Desc/File relations: "
msgstr "Tal p ver./fil-forhold: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Tal p tilbyr-forhold: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Tal p strengar med jokerteikn: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Slingringsmon: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Brukt plass i alt: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Pakkefila %s er ute av takt."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Fann ingen pakkar"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
#, fuzzy
msgid "You must give at least one search pattern"
msgstr "Du m oppgi nyaktig eitt mnster"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Finn ikkje pakken %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Pakkefiler:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
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"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Spikra pakkar:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(ikkje funne)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Installert: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Kandidat: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(ingen)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Pakke spikra til: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Versjonstabell:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, 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:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -239,11 +239,11 @@ msgstr ""
" -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
"Du finn meir informasjon p manualsidene apt-cache(8) og apt.conf(5).\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
#, fuzzy
msgid "Please insert a Disc in the drive and press enter"
msgstr ""
@@ -251,12 +251,12 @@ msgstr ""
" %s\n"
"i stasjonen %s og trykk Enter.\n"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Klarte ikkje endra namnet p %s til %s"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -264,7 +264,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
@@ -300,84 +300,79 @@ msgstr ""
" -c=? Les denne oppsettsfila.\n"
" -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Klarte ikkje f status p kjeldepakkelista %s"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "men %s skal installerast"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "men %s skal installerast"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern feil. AllUpgrade ydelagde noko"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Klarte ikkje lsa listekatalogen"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Klarte ikkje lsa nedlastingskatalogen"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
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:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Finn ingen kjeldepakke for %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -385,114 +380,114 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "M henta %sB/%sB med kjeldekodearkiv.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "M henta %sB med kjeldekodearkiv.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Hent kjeldekode %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Klarte ikkje henta nokre av arkiva."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Nedlastinga er ferdig i nedlastingsmodus"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggjekommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Barneprosessen mislukkast"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
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:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Klarte ikkje behandla byggjekrava"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Klarte ikkje henta byggjekrav for %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen byggjekrav.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, 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:1329
+#: cmdline/apt-get.cc:1320
#, 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:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -501,24 +496,24 @@ 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:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Klarte ikkje behandla byggjekrava"
@@ -626,11 +621,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -644,52 +639,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "men er ikkje installert"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "men %s skal installerast"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "men %s skal installerast"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "Den nyaste versjonen av %s er installert fr fr.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "Den nyaste versjonen av %s er installert fr fr.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Venta p %s, men den fanst ikkje"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "men %s skal installerast"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "Klarte ikkje opna %s"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -912,7 +908,7 @@ msgstr "Tidsavbrot p tilkopling til datasokkel"
msgid "Unable to accept connection"
msgstr "Klarte ikkje godta tilkoplinga"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nkkel for fil"
@@ -1001,37 +997,37 @@ msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Klarte ikkje kopla til %s %s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr ""
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Dei flgjande tilleggspakkane vil verta installerte:"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1041,31 +1037,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Feil ved lesing fr tenaren"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Utvalet mislukkast"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Tidsavbrot p sambandet"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
@@ -1073,53 +1069,296 @@ msgstr "Feil ved skriving til utfil"
msgid "Waiting for headers"
msgstr "Ventar p hovud"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "ydelagd hovudlinje"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP-tenaren sende eit ugyldig Content-Length-hovud"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP-tenaren sende eit ugyldig Content-Range-hovud"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tenaren har ydelagd sttte for omrde"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Ukjend datoformat"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "ydelagde hovuddata"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Sambandet mislukkast"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Intern feil"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Rettar p krav ..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " mislukkast."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Klarte ikkje retta p krav"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Klarte ikkje minimera oppgraderingsmengda"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Ferdig"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Du vil kanskje prva retta p desse ved kyra apt-get -f install."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nokre krav er ikkje oppfylte. Prv med -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "men %s er installert"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s skal installerast"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "men lt seg ikkje installera"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "men er ein virtuell pakke"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "men er ikkje installert"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "men skal ikkje installerast"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " eller"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Flgjande pakkar har krav som ikkje er oppfylte:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Dei flgjande NYE pakkane vil verta installerte:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Dei flgjande pakkane vil verta FJERNA:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Dei flgjande pakkane er haldne tilbake:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Dei flgjande pakkane vil verta oppgraderte:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (fordi %s) "
+
+#: apt-private/private-output.cc:696
+#, fuzzy
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n"
+"Dette br IKKJE gjerast utan at du er fullstendig klar over kva du gjer!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu oppgraderte, %lu nyleg installerte, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu installerte p nytt, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu nedgraderte, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex-kompileringsfeil - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Oppdateringskommandoen tek ingen argument"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1376,249 +1615,6 @@ msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Rettar p krav ..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " mislukkast."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Klarte ikkje retta p krav"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Klarte ikkje minimera oppgraderingsmengda"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Ferdig"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Du vil kanskje prva retta p desse ved kyra apt-get -f install."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nokre krav er ikkje oppfylte. Prv med -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "men %s er installert"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "men %s skal installerast"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "men lt seg ikkje installera"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "men er ein virtuell pakke"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "men er ikkje installert"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "men skal ikkje installerast"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " eller"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Flgjande pakkar har krav som ikkje er oppfylte:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Dei flgjande NYE pakkane vil verta installerte:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Dei flgjande pakkane vil verta FJERNA:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Dei flgjande pakkane er haldne tilbake:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Dei flgjande pakkane vil verta oppgraderte:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (fordi %s) "
-
-#: apt-private/private-output.cc:696
-#, fuzzy
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n"
-"Dette br IKKJE gjerast utan at du er fullstendig klar over kva du gjer!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu oppgraderte, %lu nyleg installerte, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu installerte p nytt, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu nedgraderte, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex-kompileringsfeil - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Oppdateringskommandoen tek ingen argument"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1672,20 +1668,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Treff "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Treff:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Hent:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Hent:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ign:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Feil "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Feil:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1711,17 +1711,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Klarte ikkje lesa %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1795,7 +1795,7 @@ msgstr "er viktige. Rett opp dei feila og [i]nstaller p nytt."
msgid "Merging available information"
msgstr "Flettar informasjon om tilgjengelege pakkar"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1819,46 +1819,46 @@ msgstr ""
" -c=? Les denne innstillingsfila.\n"
" -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Klarte ikkje f status til %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Klarte ikkje skriva til %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Finn ikkje debconf-versjonen. Er debconf installert?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Lista over pakkeutvidingar er for lang"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Feil ved lesing av katalogen %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Lista over kjeldeutvidingar er for lang"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Feil ved skriving av topptekst til innhaldsfila"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Feil ved lesing av %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
@@ -1938,11 +1938,11 @@ msgstr ""
" -c=? Les denne oppsettsfila.\n"
" -o=? Set ei vilkrleg innstilling."
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Ingen utval passa"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Enkelte filer manglar i pakkefilgruppa %s"
@@ -2052,22 +2052,22 @@ msgstr " DeLink-grensa p %sB er ndd.\n"
msgid "Archive had no package field"
msgstr "Arkivet har ikkje noko pakkefelt"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s har inga overstyringsoppfring\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s-vedlikehaldaren er %s, ikkje %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " %s har inga overstyringsoppfring\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har inga overstyringsoppfring\n"
@@ -2153,7 +2153,7 @@ msgstr "Problem ved oppheving av lenkje til %s"
msgid "Failed to rename %s to %s"
msgstr "Klarte ikkje endra namnet p %s til %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2178,11 +2178,11 @@ msgstr ""
" -c=? Les denne innstillingsfila.\n"
" -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Ukjend pakkeoppslag"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2254,6 +2254,29 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Feil MD5-sum"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Finn ikkje metodedrivaren %s."
+
+#: apt-pkg/acquire-worker.cc:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s starta ikkje rett"
+
+#: apt-pkg/acquire-worker.cc:485
+#, fuzzy, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Skifte av medum: Set inn plata merkt\n"
+" %s\n"
+"i stasjonen %s og trykk Enter.\n"
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "Klarte ikkje tolka eller opna pakkelista eller tilstandsfila."
@@ -2267,181 +2290,299 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "Kjeldelista kan ikkje lesast."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Tomt pakkelager"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Pakkelagerfila er ydelagd"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Versjonen til pakkelagerfila er ikkje kompatibel"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "Pakkelagerfila er ydelagd"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "APT stttar ikkje versjonssystemet %s"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Pakkelageret er bygd for ein annan arkitektur"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Krav"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Forkrav"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Forslag"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Tilrdingar"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Konflikt"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Byter ut"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Foreldar"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "viktig"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "pkravd"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "vanleg"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "valfri"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "tillegg"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Reknar ut oppgradering"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Finn ikkje metodedrivaren %s."
+msgid "Index file type '%s' is not supported"
+msgstr "Indeksfiltypen %s er ikkje sttta"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
+
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
+
+#: apt-pkg/sourcelist.cc:206
#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Misforma linje %lu i kjeldelista %s (URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:208
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s starta ikkje rett"
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist)"
-#: apt-pkg/acquire-worker.cc:485
-#, fuzzy, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Skifte av medum: Set inn plata merkt\n"
-" %s\n"
-"i stasjonen %s og trykk Enter.\n"
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:217
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indeksfiltypen %s er ikkje sttta"
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Byggjer kravtre"
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidatversjonar"
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Opnar %s"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Genererer kravforhold"
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Linja %u i kjeldelista %s er for lang."
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "Flettar informasjon om tilgjengelege pakkar"
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Misforma linje %u i kjeldelista %s (type)"
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:375
#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Klarte ikkje opna %s"
+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/depcache.cc:256
+#: apt-pkg/sourcelist.cc:416
#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Klarte ikkje skriva fila %s"
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typen %s er ukjend i linja %u i kjeldelista %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "Indeksfiltypen %s er ikkje sttta"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Klarte ikkje f status p %s."
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Feil ved behandling av %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Jss, du har overgtt talet p pakkenamn som APT kan handtera."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Jss, du har overgtt talet p versjonar som APT kan handtera."
+
+#: apt-pkg/pkgcachegen.cc:279
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Jss, du har overgtt talet p versjonar som APT kan handtera."
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Jss, du har overgtt talet p krav som APT kan handtera."
+
+#: apt-pkg/pkgcachegen.cc:591
+#, 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:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Klarte ikkje f status p kjeldepakkelista %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Les pakkelister"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Samlar inn filtilbod"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "IU-feil ved lagring av kjeldelager"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "endring av namn mislukkast, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Feil MD5-sum"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Feil storleik"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Ugyldig operasjon %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Skrivefeil"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2449,7 +2590,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
@@ -2465,49 +2606,49 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Klarte ikkje tolka pakkefila %s (1)"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2516,126 +2657,54 @@ msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv "
"(fordi arkitekturen manglar)."
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, 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/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Feil ved behandling av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Jss, du har overgtt talet p pakkenamn som APT kan handtera."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Jss, du har overgtt talet p versjonar som APT kan handtera."
-
-#: apt-pkg/pkgcachegen.cc:279
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Jss, du har overgtt talet p versjonar som APT kan handtera."
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Jss, du har overgtt talet p krav som APT kan handtera."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, 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:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Klarte ikkje f status p kjeldepakkelista %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Les pakkelister"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Samlar inn filtilbod"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "IU-feil ved lagring av kjeldelager"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Listekatalogen %spartial manglar."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Arkivkatalogen %spartial manglar."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Indeksfiltypen %s er ikkje sttta"
+msgid "Unable to lock directory %s"
+msgstr "Klarte ikkje lsa listekatalogen"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Les filliste"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-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/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
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/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Klarte ikkje f status p %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2657,19 +2726,19 @@ msgstr "Skjnar ikkje spikringstypen %s"
msgid "No priority (or zero) specified for pin"
msgstr "Ingen prioritet (eller null) oppgitt for spiker"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "Klarte ikkje opna fila %s"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2681,10 +2750,14 @@ msgstr ""
"om du verkeleg vil gjera det, kan du bruka innstillinga APT::Force-"
"LoopBreak."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linja %u i kjeldelista %s er for lang."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+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/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2751,11 +2824,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Kopierer pakkelister ..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Skriv ny kjeldeliste\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Kjeldelisteoppfringar for denne disken er:\n"
@@ -2765,7 +2838,7 @@ 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:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2773,140 +2846,42 @@ msgstr ""
"Feil, pkgProblemResolver::Resolve har laga brot. Dette kan skuldast pakkar "
"som er haldne tilbake."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Klarte ikkje retta opp problema. Nokre ydelagde pakkar er haldne tilbake."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Klarte ikkje tolka pakkefila %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Klarte ikkje tolka pakkefila %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Klarte ikkje tolka pakkefila %s (1)"
-
-#: apt-pkg/indexrecords.cc:91
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Merk, vel %s i staden for %s\n"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:152
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ugyldig linje i avleiingsfila: %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Klarte ikkje tolka pakkefila %s (1)"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Byggjer kravtre"
-#: apt-pkg/sourcelist.cc:170
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidatversjonar"
-#: apt-pkg/sourcelist.cc:173
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Genererer kravforhold"
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Flettar informasjon om tilgjengelege pakkar"
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/depcache.cc:252
#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
+msgid "Failed to open StateFile %s"
+msgstr "Klarte ikkje opna %s"
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:258
#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Misforma linje %lu i kjeldelista %s (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist)"
-
-#: apt-pkg/sourcelist.cc:211
-#, 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:217
-#, 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:224
-#, 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:335
-#, c-format
-msgid "Opening %s"
-msgstr "Opnar %s"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Klarte ikkje skriva fila %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Misforma linje %u i kjeldelista %s (type)"
-
-#: apt-pkg/sourcelist.cc:375
-#, 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:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typen %s er ukjend i linja %u i kjeldelista %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Klarte ikkje tolka pakkefila %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2918,208 +2893,101 @@ msgstr "Fann ikkje utgva %s av %s"
msgid "Version '%s' for '%s' was not found"
msgstr "Fann ikkje versjonen %s av %s"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Fann ikkje pakken %s"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Fann ikkje pakken %s"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Fann ikkje pakken %s"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr " Installert: "
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, fuzzy, c-format
-msgid "Configuring %s"
-msgstr "Koplar til %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
+#: apt-pkg/indexrecords.cc:83
#, fuzzy, c-format
-msgid "Removing %s"
-msgstr "Opnar %s"
+msgid "Unable to parse Release file %s"
+msgstr "Klarte ikkje tolka pakkefila %s (1)"
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/indexrecords.cc:91
#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Klarte ikkje fjerna %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "No sections in Release file %s"
+msgstr "Merk, vel %s i staden for %s\n"
-#: apt-pkg/deb/dpkgpm.cc:112
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Running post-installation trigger %s"
+msgid "No Hash entry in Release file %s"
msgstr ""
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/indexrecords.cc:145
#, fuzzy, c-format
-msgid "Directory '%s' missing"
-msgstr "Listekatalogen %spartial manglar."
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Klarte ikkje opna fila %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, fuzzy, c-format
-msgid "Preparing %s"
-msgstr "Opnar %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, fuzzy, c-format
-msgid "Unpacking %s"
-msgstr "Opnar %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, fuzzy, c-format
-msgid "Preparing to configure %s"
-msgstr "Opnar oppsettsfila %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ugyldig linje i avleiingsfila: %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:164
#, fuzzy, c-format
-msgid "Installed %s"
-msgstr " Installert: "
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Klarte ikkje tolka pakkefila %s (1)"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing for removal of %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, fuzzy, c-format
-msgid "Removed %s"
-msgstr "Tilrdingar"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, fuzzy, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Opnar oppsettsfila %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1025
-#, fuzzy, c-format
-msgid "Completely removed %s"
-msgstr "Klarte ikkje fjerna %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Klarte ikkje skriva til %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
+#, c-format
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Klarte ikkje lsa listekatalogen"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "%lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
+msgstr "Fann ikkje utvalet %s"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3254,35 +3122,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s ... Ferdig"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Fann ikkje utvalet %s"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Kan ikkje utfra mmap p ei tom fil"
@@ -3345,107 +3184,263 @@ msgstr "Klarte ikkje f status til monteringspunktet %s"
msgid "Failed to stat the cdrom"
msgstr "Klarte ikkje f status til CD-ROM"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Ukjend typeforkorting: %c"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Opnar oppsettsfila %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, 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:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaksfeil %s:%u: Misforma tagg"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaksfeil %s:%u: Ekstra rot etter verdien"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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 nivet"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaksfeil %s:%u: For mange nsta inkluderte filer"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaksfeil %s:%u: Inkludert herifr"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaksfeil %s:%u: Direktivet %s er ikkje sttta"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, fuzzy, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det vste nivet"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, 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/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Kjenner ikkje kommandolinjevalet %c (fr %s)."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Skjnar ikkje kommandolinjevalet %s"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Kommandolinjevalet %s er ikkje boolsk"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Valet %s krev eit argument."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Val %s: Spesifikasjonen av oppsettselementet m ha ein =<verdi>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, 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:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Valet %s er for langt"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "Skjnar ikkje %s. Prv true eller false."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Ugyldig operasjon %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr " Installert: "
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, fuzzy, c-format
+msgid "Configuring %s"
+msgstr "Koplar til %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Opnar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Klarte ikkje fjerna %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Listekatalogen %spartial manglar."
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Klarte ikkje opna fila %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, fuzzy, c-format
+msgid "Preparing %s"
+msgstr "Opnar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "Opnar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, fuzzy, c-format
+msgid "Preparing to configure %s"
+msgstr "Opnar oppsettsfila %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr " Installert: "
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, fuzzy, c-format
+msgid "Removed %s"
+msgstr "Tilrdingar"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Opnar oppsettsfila %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Klarte ikkje fjerna %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Klarte ikkje skriva til %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Klarte ikkje lsa listekatalogen"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "DropNode vart kalla p ein node som framleis er lenkja"
@@ -3550,7 +3545,7 @@ msgstr "Dette er ikkje eit gyldig DEB-arkiv, manglar %s-medlemmen"
msgid "Internal error, could not locate member %s"
msgstr "Intern feil, fann ikkje medlemmen %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Kontrollfila kan ikkje tolkast"
@@ -3579,23 +3574,23 @@ msgstr "Arkivet er for kort"
msgid "Failed to read the archive headers"
msgstr "Klarte ikkje lesa arkivhovuda"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Klarte ikkje oppretta ryr"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Klarte ikkje kyra gzip "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "ydelagt arkiv"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar-sjekksummen mislukkast, arkivet er ydelagt"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Ukjend TAR-hovud type %u, medlem %s"
diff --git a/po/pl.po b/po/pl.po
index 2a014c89d..1851fa805 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.9.7.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2012-07-28 21:53+0200\n"
"Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -28,146 +28,146 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Pakiet %s w wersji %s ma niespełnione zależności:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Liczba nazw pakietów: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Liczba wszystkich typów pakietów: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Zwykłych pakietów: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Czysto wirtualnych pakietów: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Pojedynczych pakietów wirtualnych: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Mieszanych pakietów wirtualnych: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Brakujących: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "W sumie różnych wersji: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "W sumie różnych opisów: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "W sumie zależności: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "W sumie zależności wersja/plik: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "W sumie zależności opis/plik: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "W sumie mapowań zapewnień: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "W sumie dopasowanych napisów: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Sumaryczny rozmiar niewykorzystanego miejsca: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Całkowity rozmiar: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Plik pakietu %s jest przestarzały."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Nie znaleziono żadnych pakietów"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Należy podać przynajmniej jeden wzorzec"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "To polecenie jest przestarzałe. Prosimy używać \"apt-mark showauto\"."
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Nie udało się odnaleźć pakietu %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Plików pakietów:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
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 "
"pakietu."
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Przypięte pakiety:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(nie znaleziono)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Zainstalowana: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Kandydująca: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(brak)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Sposób przypięcia: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Tabela wersji:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s dla %s skompilowany %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -238,20 +238,20 @@ msgstr ""
"Więcej informacji można znaleźć na stronach podręcznika apt-cache(8)\n"
"oraz apt.conf(5).\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Proszę wprowadzić nazwę dla tej płyty, np. \"Debian 5.0.3 Disk 1\""
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Proszę włożyć dysk do napędu i nacisnąć enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Nie udało się zamontować \"%s\" w \"%s\""
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -259,7 +259,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Należy powtórzyć ten proces dla reszty płyt."
@@ -295,51 +295,51 @@ msgstr ""
" -c=? Czyta wskazany plik konfiguracyjny.\n"
" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr ""
"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr ""
"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr ""
"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Zmieniono wybrany pakiet źródłowy na \"%s\" z \"%s\"\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Ignorowanie niedostępnej wersji \"%s\" pakietu \"%s\""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Nie udało się odnaleźć pakietu %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s zaznaczony jako zainstalowany ręcznie.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s zaznaczony jako zainstalowany automatycznie.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -347,31 +347,26 @@ msgstr ""
"To polecenie jest przestarzałe. Prosimy używać \"apt-mark auto\" i \"apt-"
"mark manual\"."
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Błąd wewnętrzny, spowodowany przez moduł rozwiązywania problemów"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Nie udało się zablokować katalogu %s"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Nie udało się zablokować katalogu pobierania"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
"źródła"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nie udało się odnaleźć źródła dla pakietu %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -381,7 +376,7 @@ msgstr ""
"pod adresem:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -393,69 +388,69 @@ msgstr ""
"by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego "
"pakietu.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Pomijanie już pobranego pliku \"%s\"\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Konieczne pobranie %sB archiwów źródeł.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Pobieranie źródeł %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Nie udało się pobrać niektórych archiwów."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Ukończono pobieranie w trybie samego pobierania"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Polecenie budowania \"%s\" zawiodło.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Proces potomny zawiódł"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone "
"zależności dla budowania"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -464,27 +459,27 @@ msgstr ""
"Nie znaleziono informacji o architekturze dla %s. Proszę zapoznać się z apt."
"conf(5) APT::Architectures"
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Nie udało się przetworzyć zależności dla budowania"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nie ma zależności dla budowania.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -493,7 +488,7 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ %s nie jest dozwolone "
"w pakietach \"%s\""
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -502,14 +497,14 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono "
"pakietu %s"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt "
"nowy"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -518,7 +513,7 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ kandydująca wersja "
"pakietu %s nie spełnia wymagań wersji"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -527,17 +522,17 @@ msgstr ""
"Zależność %s od %s nie może zostać spełniona, ponieważ pakiet %s nie ma "
"wersji kandydującej"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Nie udało się spełnić zależności %s od %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Nie udało się spełnić zależności dla budowania %s."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Nie udało się przetworzyć zależności dla budowania"
@@ -649,11 +644,11 @@ msgstr ""
"Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane "
"źródła"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -667,54 +662,55 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "%s nie może zostać oznaczony, ponieważ nie jest zainstalowany.\n"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s został już ustawiony jako zainstalowany ręcznie.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s został już ustawiony jako zainstalowany automatycznie.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr "%s został już zatrzymany.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr "%s został już odznaczony jako zatrzymany.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Oczekiwano na proces %s, ale nie było go"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr "%s został zatrzymany.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "Odznaczono zatrzymanie %s\n"
# Musi pasować do su i sudo.
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
"Uruchomienie dpkg nie powiodło się. Czy użyto uprawnień administratora?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -959,7 +955,7 @@ msgstr "Przekroczony czas połączenia gniazda danych"
msgid "Unable to accept connection"
msgstr "Nie udało się przyjąć połączenia"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Nie udało się obliczyć skrótu pliku"
@@ -1048,39 +1044,39 @@ msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Nie udało się połączyć z %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Błąd wewnętrzny: Prawidłowy podpis, ale nie udało się ustalić odcisku klucza!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"Nie udało się uruchomić apt-key by zweryfikować podpis (czy gnupg jest "
"zainstalowane?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Nieznany błąd podczas uruchamiania apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Następujące podpisy były błędne:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1092,31 +1088,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr "Puste pliki nie mogą być prawidłowymi archiwami"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Błąd przy pisaniu do pliku"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Błąd czytania z serwera"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Błąd przy pisaniu do pliku"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Operacja select nie powiodła się"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Przekroczenie czasu połączenia"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Błąd przy pisaniu do pliku wyjściowego"
@@ -1124,53 +1120,301 @@ msgstr "Błąd przy pisaniu do pliku wyjściowego"
msgid "Waiting for headers"
msgstr "Oczekiwanie na nagłówki"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Nieprawidłowa linia nagłówka"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek odpowiedzi"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Length"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Serwer HTTP przysłał nieprawidłowy nagłówek Content-Range"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Nieznany format daty"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Błędne dane nagłówka"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Połączenie nie powiodło się"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Błąd wewnętrzny"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Naprawianie zależności..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " nie udało się."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Nie udało się naprawić zależności"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Nie udało się zminimalizować zbioru aktualizacji"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Gotowe"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Niespełnione zależności. Proszę spróbować użyć -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Zainstalowany]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Zainstalowany]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Zainstalowany]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Zainstalowany]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "ale %s jest zainstalowany"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ale %s ma zostać zainstalowany"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "ale nie da się go zainstalować"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "ale jest pakietem wirtualnym"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "ale nie jest zainstalowany"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "ale nie zostanie zainstalowany"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " lub"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Następujące pakiety mają niespełnione zależności:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Zostaną zainstalowane następujące NOWE pakiety:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Następujące pakiety zostaną USUNIĘTE:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Następujące pakiety zostały zatrzymane:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Następujące pakiety zostaną zaktualizowane:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Zostaną zmienione następujące zatrzymane pakiety:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (z powodu %s) "
+
+#: apt-private/private-output.cc:696
+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 należy kontynuować, jeśli nie jest się pewnym tego co się robi!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu ponownie instalowanych, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu cofniętych wersji, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[T/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[t/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "T"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Błąd kompilacji wyrażenia regularnego - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Polecenie update nie wymaga żadnych argumentów"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"UWAGA: To jest tylko symulacja!\n"
+" apt-get wymaga do normalnego działania uprawnień administratora.\n"
+" Aktualnie blokowanie jest wyłączone, więc nie należy polegać\n"
+" na związku z rzeczywistą sytuacją!"
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Błąd wewnętrzny, użyto InstallPackages z uszkodzonymi pakietami!"
@@ -1451,254 +1695,6 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Pakiet \"%s\" nie jest zainstalowany, więc nie zostanie usunięty\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Naprawianie zależności..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " nie udało się."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Nie udało się naprawić zależności"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Nie udało się zminimalizować zbioru aktualizacji"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Gotowe"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Niespełnione zależności. Proszę spróbować użyć -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Zainstalowany]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Zainstalowany]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Zainstalowany]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Zainstalowany]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "ale %s jest zainstalowany"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ale %s ma zostać zainstalowany"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "ale nie da się go zainstalować"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "ale jest pakietem wirtualnym"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "ale nie jest zainstalowany"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "ale nie zostanie zainstalowany"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " lub"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Następujące pakiety mają niespełnione zależności:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Zostaną zainstalowane następujące NOWE pakiety:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Następujące pakiety zostaną USUNIĘTE:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Następujące pakiety zostały zatrzymane:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Następujące pakiety zostaną zaktualizowane:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Zostaną zainstalowane STARE wersje następujących pakietów:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Zostaną zmienione następujące zatrzymane pakiety:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (z powodu %s) "
-
-#: apt-private/private-output.cc:696
-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 należy kontynuować, jeśli nie jest się pewnym tego co się robi!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu ponownie instalowanych, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu cofniętych wersji, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu usuwanych i %lu nieaktualizowanych.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu nie w pełni zainstalowanych lub usuniętych.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[T/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[t/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "T"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Błąd kompilacji wyrażenia regularnego - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Polecenie update nie wymaga żadnych argumentów"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"UWAGA: To jest tylko symulacja!\n"
-" apt-get wymaga do normalnego działania uprawnień administratora.\n"
-" Aktualnie blokowanie jest wyłączone, więc nie należy polegać\n"
-" na związku z rzeczywistą sytuacją!"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1753,22 +1749,26 @@ msgstr ""
# Ujednolicono z aptitude
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Stary "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Stary:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Pobieranie:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Pobieranie:%lu %s"
# Wyrównane do Hit i Err.
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign. "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
# Wyrównane do Hit i Ign.
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Błąd "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Błąd:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1794,17 +1794,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Nie można czytać %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1881,7 +1881,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Łączenie informacji o dostępnych pakietach"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1905,46 +1905,46 @@ msgstr ""
" -c=? Czyta wskazany plik konfiguracyjny.\n"
" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Nie można wykonać operacji stat na %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Nie udało się pisać do %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nie udało się pobrać wersji debconf. Czy debconf jest zainstalowany?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Lista rozszerzeń pakietów jest zbyt długa"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Błąd przetwarzania katalogu %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Lista rozszerzeń źródeł jest zbyt długa"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Błąd przy zapisywaniu nagłówka do pliku zawartości"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Błąd podczas przetwarzania zawartości %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -2027,11 +2027,11 @@ msgstr ""
" -c=? Czyta wskazany plik konfiguracyjny\n"
" -o=? Ustawia dowolną opcję konfiguracji"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Nie dopasowano żadnej nazwy"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, 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\""
@@ -2143,22 +2143,22 @@ msgstr " Osiągnięto ograniczenie odłączania %sB.\n"
msgid "Archive had no package field"
msgstr "Archiwum nie posiadało pola pakietu"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nie posiada wpisu w pliku override\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " opiekunem %s jest %s, a nie %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nie posiada wpisu w pliku override źródeł\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nie posiada również wpisu w pliku override binariów\n"
@@ -2244,7 +2244,7 @@ msgstr "Problem przy usuwaniu %s"
msgid "Failed to rename %s to %s"
msgstr "Nie udało się zmienić nazwy %s na %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2269,11 +2269,11 @@ msgstr ""
" -c=? Czyta wskazany plik konfiguracyjny\n"
" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Nieznane informacje o pakiecie!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2345,6 +2345,26 @@ msgstr "Nie udało się znaleźć wpisu uwierzytelnienia dla: %s"
msgid "Hash mismatch for: %s"
msgstr "Błędna suma kontrolna dla: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Nie udało się odnaleźć sterownika metody %s."
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nie uruchomiła się poprawnie"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Proszę włożyć do napędu \"%s\" dysk o nazwie: \"%s\" i nacisnąć enter."
+
#: apt-pkg/cachefile.cc:94
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."
@@ -2357,176 +2377,302 @@ msgstr "Należy uruchomić apt-get update aby naprawić te problemy."
msgid "The list of sources could not be read."
msgstr "Nie udało się odczytać list źródeł."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Pusty magazyn podręczny pakietów"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Magazyn podręczny pakietów jest uszkodzony"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Magazyn podręczny pakietów jest w niezgodnej wersji"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr "Magazyn podręczny pakietów jest uszkodzony - jest zbyt mały"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Ta wersja APT nie obsługuje systemu wersji \"%s\""
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Ten magazyn podręczny pakietów został zbudowany dla innej architektury"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Wymaga"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Wymaga wstępnie"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Sugeruje"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Poleca"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "W konflikcie z"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Zastępuje"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Dezaktualizuje"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Narusza zależności"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Rozszerza"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "ważny"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "wymagany"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "standardowy"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "opcjonalny"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "dodatkowy"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Obliczanie aktualizacji"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Nie udało się odnaleźć sterownika metody %s."
+msgid "Index file type '%s' is not supported"
+msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nie uruchomiła się poprawnie"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Nieprawidłowa linia %lu w liście źródeł %s ([opcja] nie dająca się sparsować)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Proszę włożyć do napędu \"%s\" dysk o nazwie: \"%s\" i nacisnąć enter."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] zbyt krótka)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie jest przypisane)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie ma klucza)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Nieprawidłowa linia %lu w liście źródeł %s ([%s] klucz %s nie ma wartości)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)"
+
+#: apt-pkg/sourcelist.cc:211
+#, 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)"
+
+#: apt-pkg/sourcelist.cc:217
+#, 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)"
+
+#: apt-pkg/sourcelist.cc:224
+#, 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)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Otwieranie %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Linia %u w liście źródeł %s jest zbyt długa."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)"
+
+#: apt-pkg/sourcelist.cc:375
+#, 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"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Budowanie drzewa zależności"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nie udało się wykonać operacji stat na pliku %s."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandydujące wersje"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Magazyn podręczny ma niezgodny system wersji"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generowanie zależności"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Wystąpił błąd podczas przetwarzania %s (%s%d)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Odczyt informacji o stanie"
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Przekroczono liczbę pakietów, którą ten APT jest w stanie obsłużyć."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Przekroczono liczbę wersji, którą ten APT jest w stanie obsłużyć."
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Przekroczono liczbę opisów, którą ten APT jest w stanie obsłużyć."
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Przekroczono liczbę zależności, którą ten APT jest w stanie obsłużyć."
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nie udało się otworzyć pliku stanu %s"
+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"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nie udało się zapisać tymczasowego pliku stanu %s"
+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"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Czytanie list pakietów"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Zbieranie zapewnień plików"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Wysyłanie scenariusza do mechanizmu rozwiązywania zależności"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Przygotowywanie na otrzymanie rozwiązania"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Zewnętrzny mechanizm rozwiązywania zależności zawiódł, bez podania "
+"prawidłowego komunikatu o błędzie"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "nie udało się zmienić nazwy, %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Błędna suma kontrolna"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Błędny rozmiar"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Nieprawidłowa operacja %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Błąd zapisu"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
#, fuzzy
msgid "Does not start with a cleartext signature"
msgstr "Plik %s nie zaczyna się wiadomością podpisaną w trybie clearsign"
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2536,7 +2682,7 @@ msgstr ""
"w dalszym ciągu będą używane poprzednie pliki indeksu. Błąd GPG %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "Błąd GPG: %s: %s"
@@ -2552,14 +2698,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2568,16 +2714,16 @@ msgstr ""
"Nie udało się znaleźć oczekiwanego wpisu \"%s\" w pliku Release "
"(nieprawidłowy wpis sources.list lub nieprawidłowy plik)"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nie udało się znaleźć sumy kontrolnej \"%s\" w pliku Release"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2586,19 +2732,19 @@ msgstr ""
"Plik Release dla %s wygasnął (nieprawidłowy od %s). Aktualizacje z tego "
"repozytorium nie będą wykonywane."
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2607,125 +2753,54 @@ msgstr ""
"Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba "
"będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)."
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Nie można znaleźć źródła do pobrania wersji \"%s\" pakietu \"%s\""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Magazyn podręczny ma niezgodny system wersji"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Wystąpił błąd podczas przetwarzania %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Przekroczono liczbę pakietów, którą ten APT jest w stanie obsłużyć."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Przekroczono liczbę wersji, którą ten APT jest w stanie obsłużyć."
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Przekroczono liczbę opisów, którą ten APT jest w stanie obsłużyć."
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Przekroczono liczbę zależności, którą ten APT jest w stanie obsłużyć."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, 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"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, 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"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Czytanie list pakietów"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Zbieranie zapewnień plików"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Blok producenta %s nie zawiera odcisku"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Brakuje katalogu list %spartial."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Brakuje katalogu archiwów %spartial."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Plik indeksu typu \"%s\" nie jest obsługiwany"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "Nie udało się zablokować katalogu %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Pobieranie pliku %li z %li (pozostało %s)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Pobieranie pliku %li z %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-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 "
-"użyto ich starszej wersji."
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Należy dopisać jakieś URI pakietów źródłowych do pliku sources.list"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nie udało się wykonać operacji stat na pliku %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2749,7 +2824,7 @@ msgstr "Nierozpoznany typ przypinania %s"
msgid "No priority (or zero) specified for pin"
msgstr "Brak (lub zerowy) priorytet przypięcia"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2759,12 +2834,12 @@ msgstr ""
"5 apt.conf\" i zapoznać się z wpisem APT::Immediate-Configure aby dowiedzieć "
"się więcej. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr "Nie udało się skonfigurować \"%s\". "
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2776,10 +2851,13 @@ msgstr ""
"rozwiązanie, ale jeśli jest się pewnym swoich działań, należy włączyć opcję "
"APT::Force-LoopBreak."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linia %u w liście źródeł %s jest zbyt długa."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+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 "
+"użyto ich starszej wersji."
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2850,11 +2928,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Kopiowanie list pakietów..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Zapisywanie nowej listy źródeł\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Źródła dla tej płyty to:\n"
@@ -2866,7 +2944,7 @@ msgstr ""
"Pakiet %s ma zostać ponownie zainstalowany, ale nie można znaleźć jego "
"archiwum."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2874,143 +2952,40 @@ msgstr ""
"Błąd, pkgProblemResolver::Resolve zwrócił błąd, może to być spowodowane "
"zatrzymanymi pakietami."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nie udało się naprawić problemów, zatrzymano uszkodzone pakiety."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "Wysyłanie scenariusza do mechanizmu rozwiązywania zależności"
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr "Wysyłanie żądania do mechanizmu rozwiązywania zależności"
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr "Przygotowywanie na otrzymanie rozwiązania"
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Zewnętrzny mechanizm rozwiązywania zależności zawiódł, bez podania "
-"prawidłowego komunikatu o błędzie"
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr "Wykonywanie zewnętrznego mechanizmu rozwiązywania zależności"
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Nie udało się zanalizować pliku pakietu %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Nie udało się zanalizować pliku pakietu %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nie udało się przeanalizować pliku Release %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Brak sekcji w pliku Release %s"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Brak wpisu Hash w pliku Release %s"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Nieprawidłowy wpis Valid-Until w pliku Release %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Nieprawidłowy wpis Date w pliku Release %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Nieprawidłowa linia %lu w liście źródeł %s ([opcja] nie dająca się sparsować)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([opcja] zbyt krótka)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie jest przypisane)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Nieprawidłowa linia %lu w liście źródeł %s ([%s] nie ma klucza)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Nieprawidłowa linia %lu w liście źródeł %s ([%s] klucz %s nie ma wartości)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Budowanie drzewa zależności"
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandydujące wersje"
-#: apt-pkg/sourcelist.cc:211
-#, 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)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generowanie zależności"
-#: apt-pkg/sourcelist.cc:217
-#, 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)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Odczyt informacji o stanie"
-#: apt-pkg/sourcelist.cc:224
+#: apt-pkg/depcache.cc:252
#, 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)"
-
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Otwieranie %s"
+msgid "Failed to open StateFile %s"
+msgstr "Nie udało się otworzyć pliku stanu %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie udało się zapisać tymczasowego pliku stanu %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, 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"
-
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Nie udało się zanalizować pliku pakietu %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -3022,52 +2997,52 @@ msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione"
msgid "Version '%s' for '%s' was not found"
msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Nie udało się odnaleźć zadania \"%s\""
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr ""
"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr ""
"Nie udało się znaleźć żadnego pakietu według wyrażenia regularnego \"%s\""
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Nie udało się wybrać wersji z pakietu \"%s\", ponieważ jest on czysto "
"wirtualny"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Nie udało się wybrać najnowszej wersji pakietu \"%s\", ponieważ jest on "
"czysto wirtualny"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Nie udało się wybrać wersji kandydującej pakietu %s, ponieważ nie ma "
"kandydata"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Nie udało się wybrać zainstalowanej wersji z pakietu %s, ponieważ nie jest "
"zainstalowany"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3076,183 +3051,59 @@ msgstr ""
"Nie udało się wybrać zainstalowanej ani kandydującej wersji pakietu \"%s\", "
"ponieważ nie ma żadnej z nich"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Instalowanie %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Konfigurowanie %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Usuwanie %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "Całkowite usuwanie %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Proszę odnotować zniknięcie %s"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Uruchamianie wyzwalacza post-installation %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Brakuje katalogu \"%s\""
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Nie udało się otworzyć pliku \"%s\""
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Przygotowywanie %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Unpacking %s"
-msgstr "Rozpakowywanie %s"
+msgid "Unable to parse Release file %s"
+msgstr "Nie udało się przeanalizować pliku Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Preparing to configure %s"
-msgstr "Przygotowywanie do konfiguracji %s"
+msgid "No sections in Release file %s"
+msgstr "Brak sekcji w pliku Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Installed %s"
-msgstr "Pakiet %s został zainstalowany"
+msgid "No Hash entry in Release file %s"
+msgstr "Brak wpisu Hash w pliku Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Przygotowywanie do usunięcia %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Nieprawidłowy wpis Valid-Until w pliku Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Removed %s"
-msgstr "Pakiet %s został usunięty"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Nieprawidłowy wpis Date w pliku Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Przygotowywanie do całkowitego usunięcia %s"
+msgid "%lid %lih %limin %lis"
+msgstr "%lidni %lig %limin %lis"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Completely removed %s"
-msgstr "Pakiet %s został całkowicie usunięty"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Nie udało się pisać do %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr "Operacja została przerwana, zanim mogła zostać zakończona"
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr "Brak raportu programu apport, ponieważ osiągnięto limit MaxReports"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że "
-"przyczyna niepowodzenia leży w poprzednim błędzie."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
-"przepełnienie dysku"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd "
-"braku wolnej pamięci"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
-"przepełnienie dysku"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd "
-"wejścia/wyjścia dpkg"
+msgid "%lih %limin %lis"
+msgstr "%lig %limin %lis"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Nie udało się zablokować katalogu administracyjnego (%s), czy inny proces go "
-"używa?"
+msgid "%limin %lis"
+msgstr "%limin %lis"
-# Musi pasować do su i sudo.
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Nie udało się zablokować katalogu administracyjnego (%s), czy użyto "
-"uprawnień administratora?"
+msgid "%lis"
+msgstr "%lis"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"dpkg został przerwany, należy wykonać ręcznie \"%s\", aby naprawić problem."
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Niezablokowany"
+msgid "Selection %s not found"
+msgstr "Nie odnaleziono wyboru %s"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3392,35 +3243,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Gotowe"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lidni %lig %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lig %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Nie odnaleziono wyboru %s"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Nie można wykonać mmap na pustym pliku"
@@ -3486,109 +3308,282 @@ msgstr "Nie udało się wykonać operacji stat na punkcie montowania %s"
msgid "Failed to stat the cdrom"
msgstr "Nie udało się wykonać operacji stat na CDROM-ie"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Nierozpoznany skrót typu: \"%c\""
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Otwieranie pliku konfiguracyjnego %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Błąd składniowy %s:%u: Blok nie zaczyna się nazwą."
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Błąd składniowy %s:%u: Błędny znacznik"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Błąd składniowy %s:%u: Po wartości występują śmieci"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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 najwyższym poziomie"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, 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"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Błąd składniowy %s:%u: Włączony tutaj"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Błąd składniowy %s:%u: Nieobsługiwana dyrektywa \"%s\""
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Błąd składniowy %s:%u: czysta dyrektywa wymaga drzewa opcji jako argumentu"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, 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"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Opcja linii poleceń \"%c\" [z %s] jest nieznana."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Niezrozumiała opcja linii poleceń %s"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Opcja linii poleceń %s nie jest typu logicznego"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Opcja %s wymaga argumentu."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Opcja %s: Specyfikacja elementu konfiguracji musi zawierać =<wartość>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "Opcja %s wymaga argumentu typu całkowitego, nie \"%s\""
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Opcja \"%s\" jest zbyt długa"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "Znaczenie %s jest nieznane, proszę spróbować true lub false."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Nieprawidłowa operacja %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Instalowanie %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Konfigurowanie %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Usuwanie %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "Całkowite usuwanie %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Proszę odnotować zniknięcie %s"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Uruchamianie wyzwalacza post-installation %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Brakuje katalogu \"%s\""
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Nie udało się otworzyć pliku \"%s\""
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Przygotowywanie %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Rozpakowywanie %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Przygotowywanie do konfiguracji %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "Pakiet %s został zainstalowany"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Przygotowywanie do usunięcia %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "Pakiet %s został usunięty"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Przygotowywanie do całkowitego usunięcia %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "Pakiet %s został całkowicie usunięty"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Nie udało się pisać do %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "Operacja została przerwana, zanim mogła zostać zakończona"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr "Brak raportu programu apport, ponieważ osiągnięto limit MaxReports"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "problemy z zależnościami - pozostawianie nieskonfigurowanego"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Brak raportu programu apport, ponieważ komunikat błędu wskazuje, że "
+"przyczyna niepowodzenia leży w poprzednim błędzie."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
+"przepełnienie dysku"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd "
+"braku wolnej pamięci"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na "
+"przepełnienie dysku"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Brak raportu programu apport, ponieważ komunikat błędu wskazuje na błąd "
+"wejścia/wyjścia dpkg"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Nie udało się zablokować katalogu administracyjnego (%s), czy inny proces go "
+"używa?"
+
+# Musi pasować do su i sudo.
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+"Nie udało się zablokować katalogu administracyjnego (%s), czy użyto "
+"uprawnień administratora?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"dpkg został przerwany, należy wykonać ręcznie \"%s\", aby naprawić problem."
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Niezablokowany"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "DropNode wywołane na wciąż podłączonym węźle"
@@ -3693,7 +3688,7 @@ msgstr "To nie jest poprawne archiwum DEB, brakuje składnika \"%s\""
msgid "Internal error, could not locate member %s"
msgstr "Błąd wewnętrzny, nie udało się odnaleźć składnika %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Plik kontrolny nie może zostać poprawnie zinterpretowany"
@@ -3722,23 +3717,23 @@ msgstr "Archiwum jest za krótkie"
msgid "Failed to read the archive headers"
msgstr "Nie udało się odczytać nagłówków archiwum"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Nie udało się utworzyć potoków"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Nie udało się uruchomić programu gzip "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Uszkodzone archiwum"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Niepoprawna suma kontrolna tar, archiwum jest uszkodzone"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Nieznany typ nagłówka TAR %u, składnik %s"
diff --git a/po/pt.po b/po/pt.po
index 6219d8cd8..4f05ada82 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2012-06-29 15:45+0100\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -23,147 +23,147 @@ msgstr ""
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:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Total de nomes de pacotes: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Total de estruturas de pacotes: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Pacotes normais: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Pacotes virtuais puros: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Pacotes virtuais únicos: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Pacotes virtuais misturados: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Faltam: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Total de versões distintas: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Total de descrições distintas: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Total de dependências: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Total de relações ver/ficheiro: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Total de relações Desc/Ficheiro: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Total de Mapeamentos 'Provides': "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Total de strings globbed: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Espaço total desperdiçado: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Espaço total contabilizado: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "O ficheiro do pacote %s está dessincronizado."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Não foi encontrado nenhum pacote"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Tem de fornecer pelo menos um padrão de busca"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
"Este comando foi depreceado. Em vez disso por favor utilize 'apt-mark "
"showauto'."
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Não foi possível encontrar o pacote %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Ficheiros de Pacotes :"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
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"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Pacotes Marcados:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(não encontrado)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Instalado: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Candidato: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(nenhum)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Marcação do Pacote: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Tabela de Versão:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s compilado em %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -234,21 +234,21 @@ msgstr ""
"tmp\n"
"Para mais informações veja as páginas do manual apt-cache(8) e apt.conf(5).\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
"Por favor indique um nome para este Disco, tal como 'Debian 5.0.3 Disco 1'"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Por favor insira um Disco no leitor e pressione enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Falhou ao montar '%s' para '%s'"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -256,7 +256,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Repita este processo para o resto dos CDs no seu conjunto."
@@ -293,48 +293,48 @@ msgstr ""
" -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "A escolher '%s' como pacote pacote de código fonte em vez de '%s'\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Ignorar a versão '%s', não disponível, do pacote '%s'"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível encontrar o pacote %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s está definido para ser instalado manualmente.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s está definido para ser instalado automaticamente.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -342,29 +342,24 @@ msgstr ""
"Este comando foi depreceado. Em vez disso, por favor utilize 'apt-mark auto' "
"e 'apt-mark manual'."
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro Interno, o solucionador de problemas estragou coisas"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Impossível criar acesso exclusivo ao directório %s"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Impossível criar acesso exclusivo ao directório de downloads"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Não foi possível encontrar um pacote de código fonte para %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -374,7 +369,7 @@ msgstr ""
"'%s' em:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -385,70 +380,70 @@ msgstr ""
"bzr branch %s\n"
"para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "É necessário obter %sB de arquivos de código fonte.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter código fonte %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Falhou obter alguns arquivos."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Download completo e em modo de fazer apenas o download"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"A saltar a descompactação do pacote de código fonte já descompactado em %s\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "O comando de descompactação '%s' falhou.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, 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:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "O comando de compilação '%s' falhou.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "O processo filho falhou"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
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:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -457,28 +452,28 @@ msgstr ""
"Nenhuma informação de arquitectura disponível para %s. Para configuração "
"veja apt.conf(5) APT::Architectures"
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Falhou processar as dependências de compilação"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Não foi possível obter informações de dependências de compilação para %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de compilação.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -487,7 +482,7 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque %s não é permitido "
"em pacotes '%s'"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -496,14 +491,14 @@ msgstr ""
"a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não "
"pôde ser encontrado"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falha ao satisfazer a dependência %s para %s: O pacote instalado %s é "
"demasiado novo"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -512,7 +507,7 @@ msgstr ""
"a dependência de %s para %s não pode ser satisfeita porque a versão "
"candidata do pacote %s não pode satisfazer os requisitos de versão"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -521,17 +516,17 @@ msgstr ""
"a dependência de %s para %s não pode ser satisfeita porque o pacote %s não "
"tem versão candidata"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, 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:1412
+#: cmdline/apt-get.cc:1403
#, 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:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Falhou processar as dependências de compilação"
@@ -643,11 +638,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -661,52 +656,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "%s não pode ser marcado pois não está instalado.\n"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s já estava definido para ser instalado manualmente.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s já estava definido para ser instalado automaticamente.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr "%s já estava marcado para manter.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr "%s já estava para não manter.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperou por %s mas não estava lá"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr "%s marcado para manter.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "Cancelou manter em %s.\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr "Falhou executar dpkg. É root?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -948,7 +944,7 @@ msgstr "Ligação de socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossível aceitar ligação"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Problema ao calcular o hash do ficheiro"
@@ -1037,40 +1033,40 @@ msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Não foi possível ligar a %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
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:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Pelo menos uma assinatura inválida foi encontrada."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"Não foi possível executar 'apt-key' para verificar a assinatura (o gnupg "
"está instalado?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Erro desconhecido ao executar apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "As seguintes assinaturas eram inválidas:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1082,31 +1078,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr "Ficheiros vazios não podem ser arquivos válidos"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Erro ao escrever para o ficheiro"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Erro ao ler do servidor"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Erro ao escrever para ficheiro"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "A selecção falhou"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "O tempo da ligação expirou"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Erro ao escrever para o ficheiro de saída"
@@ -1114,53 +1110,298 @@ msgstr "Erro ao escrever para o ficheiro de saída"
msgid "Waiting for headers"
msgstr "A aguardar por cabeçalhos"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Linha de cabeçalho errada"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor HTTP enviou um cabeçalho Content-Length inválido"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor HTTP enviou um cabeçalho Content-Range inválido"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Este servidor HTTP possui suporte de range errado"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Dados de cabeçalho errados"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "A ligação falhou"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Erro interno"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "A corrigir dependências..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " falhou."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Não foi possível corrigir dependências"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Não foi possível minimizar o conjunto de actualizações"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Feito"
+
+#: apt-private/private-cachefile.cc:110
+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."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependências não satisfeitas. Tente utilizar -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "mas %s está instalado"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mas %s está para ser instalado"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "mas não é instalável"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "mas é um pacote virtual"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "mas não está instalado"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "mas não vai ser instalado"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " ou"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Serão instalados os seguintes NOVOS pacotes:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Serão REMOVIDOS os seguintes pacotes:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Serão actualizados os seguintes pacotes:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Será feito o DOWNGRADE aos seguintes pacotes:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Os seguintes pacotes mantidos serão mudados:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (devido a %s) "
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+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!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalados, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu a que foi feito o downgrade, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu a remover e %lu não actualizados.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Erro de compilação de regex - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "O comando update não leva argumentos"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"NOTE:\tIsto é apenas uma simulação!\n"
+"\to apt-get necessita de privilégios de root para a execução real.\n"
+"\tTenha em mente que o acesso exclusivo está desabilitado,\n"
+"\tpor isso não confie na relevância da real situação actual!"
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
@@ -1424,251 +1665,6 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr "O pacote '%s' não está instalado, por isso não será removido\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "A corrigir dependências..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " falhou."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Não foi possível corrigir dependências"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Não foi possível minimizar o conjunto de actualizações"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Feito"
-
-#: apt-private/private-cachefile.cc:110
-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."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependências não satisfeitas. Tente utilizar -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "mas %s está instalado"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mas %s está para ser instalado"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "mas não é instalável"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "mas é um pacote virtual"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "mas não está instalado"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "mas não vai ser instalado"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " ou"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Os pacotes a seguir têm dependências não satisfeitas:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Serão instalados os seguintes NOVOS pacotes:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Serão REMOVIDOS os seguintes pacotes:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Serão mantidos em suas versões actuais os seguintes pacotes:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Serão actualizados os seguintes pacotes:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Será feito o DOWNGRADE aos seguintes pacotes:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Os seguintes pacotes mantidos serão mudados:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (devido a %s) "
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-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!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu pacotes actualizados, %lu pacotes novos instalados, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalados, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu a que foi feito o downgrade, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu a remover e %lu não actualizados.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Erro de compilação de regex - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "O comando update não leva argumentos"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"NOTE:\tIsto é apenas uma simulação!\n"
-"\to apt-get necessita de privilégios de root para a execução real.\n"
-"\tTenha em mente que o acesso exclusivo está desabilitado,\n"
-"\tpor isso não confie na relevância da real situação actual!"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1722,20 +1718,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Hit "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Obter:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Obter:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1761,17 +1761,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Não foi possível ler %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1849,7 +1849,7 @@ msgstr ""
msgid "Merging available information"
msgstr "A juntar a informação disponível"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1874,46 +1874,46 @@ msgstr ""
" -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Não foi possível fazer stat %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Não conseguiu escrever para %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Não pode obter a versão do debconf. O debconf está instalado?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "A lista de extensão de pacotes é demasiado longa"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Erro ao processar o directório %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Lista de extensão de códigos-fonte é demasiado longa"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Erro ao escrever o cabeçalho no ficheiro de conteúdo"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Erro ao processar o conteúdo %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1994,11 +1994,11 @@ msgstr ""
" -c=? Ler este ficheiro de configuração\n"
" -o=? Definir uma opção de configuração arbitrária"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Nenhuma selecção coincidiu"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Faltam alguns ficheiros no grupo `%s' do ficheiro do pacote"
@@ -2110,22 +2110,22 @@ msgstr " Limite DeLink de %sB atingido.\n"
msgid "Archive had no package field"
msgstr "Arquivo não possuía campo package"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s não possui entrada override\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " o maintainer de %s é %s, não %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s não possui fonte de entrada de 'override'\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s também não possui entrada binária de 'override'\n"
@@ -2211,7 +2211,7 @@ msgstr "Problema ao executar unlinking %s"
msgid "Failed to rename %s to %s"
msgstr "Falhou renomear %s para %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2235,11 +2235,11 @@ msgstr ""
" -c=? Ler este ficheiro de configuração\n"
" -o=? Definir uma opção de configuração arbitrária, p.e. dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Registo de pacote desconhecido!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2315,6 +2315,27 @@ msgstr "Não foi possível encontrar registo de autenticação para: %s"
msgid "Hash mismatch for: %s"
msgstr "Hash não coincide para: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, 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:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Método %s não iniciou correctamente"
+
+#: apt-pkg/acquire-worker.cc:485
+#, 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/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2329,177 +2350,306 @@ msgstr "Você terá que executar apt-get update para corrigir estes problemas"
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pôde ser lida."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Cache de pacotes vazia"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "O ficheiro de cache de pacotes está corrompido"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
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:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr "O ficheiro de cache de pacotes está corrompido, é demasiado pequeno"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, 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:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "A cache de pacotes foi gerada para uma arquitectura diferente"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Depende"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Pré-Depende"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Sugere"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Recomenda"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Em Conflito"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Substitui"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Obsoleta"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Estraga"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Aumenta"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "importante"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "necessário"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "padrão"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "opcional"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "extra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "A calcular a actualização"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "O driver do método %s não pôde ser encontrado."
+msgid "Index file type '%s' is not supported"
+msgstr "Tipo do ficheiro de índice '%s' não é suportado"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Método %s não iniciou correctamente"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Linha mal formada %lu na lista de fontes %s ([opção] não interpretável)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Linha mal formada %lu na lista de fontes %s ([opção] demasiado curta)"
+
+#: apt-pkg/sourcelist.cc:184
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
-"Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
+"Linha mal formada %lu na lista de fontes %s ([%s] não é uma atribuição)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:190
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Linha mal formada %lu na lista de fontes %s ([%s] não tem chave)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Linha mal formada %lu na lista de fontes %s ([%s] chave %s não tem valor)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Linha mal formada %lu na lista de fontes %s (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Linha mal formada %lu na lista de fontes %s (distribuição)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Linha mal formada %lu na lista de fontes %s (distribuição absoluta)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Linha mal formada %lu na lista de fontes %s (dist parse)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "A abrir %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, 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:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Linha mal formada %u na lista de fontes %s (tipo)"
+
+#: apt-pkg/sourcelist.cc:375
+#, 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:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "Tipo do ficheiro de índice '%s' não é suportado"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "A construir árvore de dependências"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Não foi possível fazer stat %s."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versões candidatas"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "A cache possui um sistema de versões incompatível"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Geração de dependências"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Ocorreu um erro ao processar %s (%s%d)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "A ler a informação de estado"
+#: apt-pkg/pkgcachegen.cc:273
+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:276
+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:279
+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:282
+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/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Falhou abrir o StateFile %s"
+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/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falha escrever ficheiro temporário StateFile %s"
+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:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "A ler as listas de pacotes"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "A obter File Provides"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Erro de I/O ao gravar a cache de código fonte"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Enviar cenário a resolver"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Enviar pedido para resolvedor"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Preparar para receber solução"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "Executar resolvedor externo"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "falhou renomear, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Código de verificação hash não coincide"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Tamanho incorrecto"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Operação %s inválida"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Erro de escrita"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
#, fuzzy
msgid "Does not start with a cleartext signature"
msgstr "O ficheiro %s não começa com uma mensagem assinada"
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2510,7 +2660,7 @@ msgstr ""
"GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "Erro GPG: %s: %s"
@@ -2526,14 +2676,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2542,18 +2692,18 @@ msgstr ""
"Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada "
"errada em sources.list ou ficheiro malformado)"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Não foi possível encontrar hash sum para '%s' no ficheiro Release"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
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:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2562,19 +2712,19 @@ msgstr ""
"O ficheiro Release para %s está expirado (inválido desde %s). Não serão "
"aplicadas as actualizações para este repositório."
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2584,12 +2734,12 @@ msgstr ""
"significar que você precisa corrigir manualmente este pacote. (devido a "
"arquitectura em falta)"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Não conseguiu encontrar uma fonte para obter a versão '%s' de '%s'"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2597,118 +2747,42 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "A cache possui um sistema de versões incompatível"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Ocorreu um erro ao processar %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:273
-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:276
-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:279
-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:282
-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:591
-#, 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:1203
-#, 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:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "A ler as listas de pacotes"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "A obter File Provides"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Erro de I/O ao gravar a cache de código fonte"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "O bloco de fabricante %s não contém a impressão digital"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Falta directório de listas %spartial."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Falta o directório de arquivos %spartial."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Tipo do ficheiro de índice '%s' não é suportado"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "Impossível criar acesso exclusivo ao directório %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "A obter o ficheiro %li de %li (%s restantes)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "A obter o ficheiro %li de %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-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/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Você deve colocar alguns URIs 'source' no seu sources.list"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Não foi possível fazer stat %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2732,7 +2806,7 @@ msgstr "Não foi possível entender o tipo de marca (pin) %s"
msgid "No priority (or zero) specified for pin"
msgstr "Nenhuma prioridade (ou zero) especificada para marcação (pin)"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2741,12 +2815,12 @@ msgstr ""
"Não foi possível proceder à configuração imediata em '%s'. Para detalhes, "
"por favor veja man 5 apt.conf em APT::Immediate-Configure. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr "Não pode configurar '%s'. "
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2758,10 +2832,13 @@ msgstr ""
"normalmente é mau, mas se você quer realmente fazer isso, active a opção "
"APT::Force-LoopBreak."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linha %u é demasiado longa na lista de fontes %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+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/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2832,11 +2909,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "A copiar listas de pacotes..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "A escrever lista de novas source\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "As entradas de listas de Source para este Disco são:\n"
@@ -2848,7 +2925,7 @@ msgstr ""
"O pacote %s necessita ser reinstalado, mas não foi possível encontrar um "
"repositório para o mesmo."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2856,144 +2933,42 @@ msgstr ""
"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
"pacotes mantidos (hold)."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Não foi possível corrigir problemas, você tem pacotes mantidos (hold) "
"estragados."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "Enviar cenário a resolver"
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr "Enviar pedido para resolvedor"
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr "Preparar para receber solução"
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr "Executar resolvedor externo"
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Não foi possível fazer parse ao ficheiro Release %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Nenhuma secção, no ficheiro Release %s"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Nenhuma entrada hash no ficheiro Release %s"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Entrada inválida, 'Valid-until', no ficheiro de Release: %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Entrada, 'Date', inválida no ficheiro Release %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Linha mal formada %lu na lista de fontes %s ([opção] não interpretável)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Linha mal formada %lu na lista de fontes %s ([opção] demasiado curta)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Linha mal formada %lu na lista de fontes %s ([%s] não é uma atribuição)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Linha mal formada %lu na lista de fontes %s ([%s] não tem chave)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Linha mal formada %lu na lista de fontes %s ([%s] chave %s não tem valor)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Linha mal formada %lu na lista de fontes %s (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Linha mal formada %lu na lista de fontes %s (distribuição)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "A construir árvore de dependências"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versões candidatas"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Linha mal formada %lu na lista de fontes %s (distribuição absoluta)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Geração de dependências"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Linha mal formada %lu na lista de fontes %s (dist parse)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "A ler a informação de estado"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "A abrir %s"
+msgid "Failed to open StateFile %s"
+msgstr "Falhou abrir o StateFile %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Linha mal formada %u na lista de fontes %s (tipo)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falha escrever ficheiro temporário StateFile %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, 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:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -3005,49 +2980,49 @@ msgstr "Não foi encontrado o Release '%s' para '%s'"
msgid "Version '%s' for '%s' was not found"
msgstr "Não foi encontrada a versão '%s' para '%s'"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Não foi possível encontrar a tarefa '%s'"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Não foi possível seleccionar versões do pacote '%s' pois é puramente virtual"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Não foi possível seleccionar a versão mais recente a partir do pacote '%s' "
"já que é puramente virtual"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Não é possível seleccionar a versão candidata do pacote %s já que não tem "
"candidato"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Não é possível seleccionar a versão instalada do pacote %s pois não está "
"instalado"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3056,183 +3031,59 @@ msgstr ""
"Não pode seleccionar a versão instalada nem a versão candidata do pacote "
"'%s' pois não tem nenhuma destas"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "A instalar %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "A configurar %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "A remover %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "A remover completamente %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "A notar o desaparecimento de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "A correr o 'trigger' de pós-instalação %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Falta o directório '%s'"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Não foi possível abrir ficheiro o '%s'"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "A preparar %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Unpacking %s"
-msgstr "A desempacotar %s"
+msgid "Unable to parse Release file %s"
+msgstr "Não foi possível fazer parse ao ficheiro Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Preparing to configure %s"
-msgstr "A preparar para configurar %s"
+msgid "No sections in Release file %s"
+msgstr "Nenhuma secção, no ficheiro Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Installed %s"
-msgstr "%s instalado"
+msgid "No Hash entry in Release file %s"
+msgstr "Nenhuma entrada hash no ficheiro Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "A preparar a remoção de %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Entrada inválida, 'Valid-until', no ficheiro de Release: %s"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Removed %s"
-msgstr "%s removido"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Entrada, 'Date', inválida no ficheiro Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "A preparar para remover completamente %s"
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Completely removed %s"
-msgstr "Remoção completa de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Não conseguiu escrever para %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr "A operação foi interrompida antes de poder terminar"
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr "Nenhum relatório apport escrito pois MaxReports já foi atingido"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "problemas de dependências - deixando por configurar"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Nenhum relatório apport escrito pois a mensagem de erro indica que é um erro "
-"de seguimento de um erro anterior."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
-"cheio"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Nenhum relatório apport escrito pois a mensagem de erro indica um erro de "
-"memória esgotada"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
-"cheio"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Nenhum relatório apport escrito pois a mensagem de erro indica um erro de I/"
-"O do dpkg"
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Não foi possível obter acesso exclusivo ao directório de administração (%s), "
-"outro processo está a utilizá-lo?"
+msgid "%limin %lis"
+msgstr "%limin %lis"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Não foi possível criar acesso exclusivo ao directório de administração (%s), "
-"é root?"
+msgid "%lis"
+msgstr "%lis"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"O dpkg foi interrompido, para corrigir o problema tem de correr manualmente "
-"'%s'"
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Sem acesso exclusivo"
+msgid "Selection %s not found"
+msgstr "A selecção %s não foi encontrada"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3375,35 +3226,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Pronto"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "A selecção %s não foi encontrada"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Não é possível fazer mmap a um ficheiro vazio"
@@ -3469,110 +3291,283 @@ msgstr "Impossível executar stat ao ponto de montagem %s"
msgid "Failed to stat the cdrom"
msgstr "Impossível executar stat ao cdrom"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Abreviatura de tipo desconhecida: '%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "A abrir o ficheiro de configuração %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Erro de sintaxe %s:%u: O bloco começa sem nome."
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Erro de sintaxe %s:%u: Tag mal formada"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, 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:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Erro de sintaxe %s:%u: Demasiados includes encadeados"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, 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:894
+#: apt-pkg/contrib/configuration.cc:900
#, 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:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Erro de sintaxe %s:%u: directiva clara necessita de uma árvore de opções "
"como argumento"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, 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/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Opção '%c' da linha de comandos [de %s] é desconhecida."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Opção %s de linha de comandos não é compreendida"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Opção %s da linha de comandos não é booleana"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "A opção %s necessita de um argumento."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Opção %s: Especificação de item de configuração tem de ter um =<val>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "Opção %s necessita de um número inteiro como argumento, não '%s'"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Opção '%s' é demasiado longa"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, 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:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Operação %s inválida"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "A instalar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "A configurar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "A remover %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "A remover completamente %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "A notar o desaparecimento de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "A correr o 'trigger' de pós-instalação %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Falta o directório '%s'"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Não foi possível abrir ficheiro o '%s'"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "A preparar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "A desempacotar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "A preparar para configurar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "%s instalado"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "A preparar a remoção de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "%s removido"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "A preparar para remover completamente %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "Remoção completa de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Não conseguiu escrever para %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "A operação foi interrompida antes de poder terminar"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr "Nenhum relatório apport escrito pois MaxReports já foi atingido"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "problemas de dependências - deixando por configurar"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Nenhum relatório apport escrito pois a mensagem de erro indica que é um erro "
+"de seguimento de um erro anterior."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
+"cheio"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Nenhum relatório apport escrito pois a mensagem de erro indica um erro de "
+"memória esgotada"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
+"cheio"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Nenhum relatório apport escrito pois a mensagem de erro indica um erro de I/"
+"O do dpkg"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Não foi possível obter acesso exclusivo ao directório de administração (%s), "
+"outro processo está a utilizá-lo?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+"Não foi possível criar acesso exclusivo ao directório de administração (%s), "
+"é root?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"O dpkg foi interrompido, para corrigir o problema tem de correr manualmente "
+"'%s'"
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Sem acesso exclusivo"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "DropNode chamado em nó ainda linkado"
@@ -3677,7 +3672,7 @@ msgstr "Este não é um arquivo DEB válido, falta o membro '%s'"
msgid "Internal error, could not locate member %s"
msgstr "Erro Interno, não foi possível localizar o membro %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Ficheiro de controle não interpretável"
@@ -3706,23 +3701,23 @@ msgstr "Arquivo é demasiado pequeno"
msgid "Failed to read the archive headers"
msgstr "Falha ao ler os cabeçalhos do arquivo"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Falhou a criação de pipes"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Falhou executar gzip "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Arquivo corrompido"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "A soma de controlo do tar falhou, arquivo corrompido"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4d637702b..5e2abd988 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2008-11-17 02:33-0200\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -23,148 +23,148 @@ msgstr ""
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:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Total de Nomes de Pacotes: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid "Total package structures: "
msgstr "Total de Nomes de Pacotes: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Pacotes normais: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Pacotes puramente virtuais: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Pacotes virtuais únicos: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Pacotes virtuais misturados: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Faltando: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Total de versões distintas: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Total de descrições distintas: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Total de dependências: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Total de relações ver/arquivo: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Total de relações Desc/Arquivo: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Total de mapeamentos \"Provides\": "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Total de strings \"globbed\": "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Total de espaço frouxo: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Total de espaço contabilizado para: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "O arquivo de pacote %s está fora de sincronia."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Nenhum pacote encontrado"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
#, fuzzy
msgid "You must give at least one search pattern"
msgstr "Você deve passar exatamente um padrão"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Impossível encontrar o pacote %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Arquivos de pacote:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
"O cache está fora de sincronia, não foi possível fazer a referência cruzada "
"de um arquivo de pacote"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Pacotes alfinetados (\"pinned\"):"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(não encontrado)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Instalado: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Candidato: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(nenhum)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Pacote alfinetado (\"pin\"): "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Tabela de versão:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s para %s compilado em %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -239,22 +239,22 @@ msgstr ""
"tmp\n"
"Veja as páginas de manual apt-cache(8) e apt.conf(5) para mais informações.\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
"Por favor, forneça um nome para este Disco, algo como 'Debian 2.1r1 Disco 1'"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Por favor, insira um Disco na unidade e pressione enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Falhou ao renomear %s para %s"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -262,7 +262,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Repita este processo para o restante dos CDs em seu conjunto."
@@ -300,83 +300,78 @@ msgstr ""
" -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Impossível achar pacote %s"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Impossível achar pacote %s"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Impossível achar pacote %s"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível achar pacote %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s configurado para instalar manualmente.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s configurado para instalar manualmente.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Erro interno, o solucionador de problemas quebrou coisas"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Impossível criar trava no diretório de listas"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Impossível criar trava no diretório de download"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
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:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossível encontrar um pacote fonte para %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -384,96 +379,96 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Pulando arquivo já baixado '%s'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Preciso obter %sB/%sB de arquivos fonte.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Preciso obter %sB de arquivos fonte.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter fonte %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Falhou ao buscar alguns arquivos."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Baixar completo e no modo somente baixar (\"download only\")"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando de desempacotamento '%s' falhou.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, 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:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando de construção '%s' falhou.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Processo filho falhou"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
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:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Falhou ao processar as dependências de construção"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, 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:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s não tem dependências de construção.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -482,7 +477,7 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
"pode ser encontrado"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -491,14 +486,14 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
"pode ser encontrado"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito "
"novo"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -507,7 +502,7 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque nenhuma versão "
"disponível do pacote %s pode satisfazer os requerimentos de versão"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -516,17 +511,17 @@ msgstr ""
"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
"pode ser encontrado"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falhou ao satisfazer a dependência de %s por %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, 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:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Falhou ao processar as dependências de construção"
@@ -636,11 +631,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -654,52 +649,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "mas não está instalado"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s configurado para instalar manualmente.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s configurado para instalar manualmente.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s já é a versão mais nova.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s já é a versão mais nova.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Esperado %s mas este não estava lá"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "%s configurado para instalar manualmente.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "Falhou ao abrir %s"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -920,7 +916,7 @@ msgstr "Conexão do socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossível aceitar conexão"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Problema criando o hash do arquivo"
@@ -1009,40 +1005,41 @@ msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Impossível conectar em %s %s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
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:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Ao menos uma assinatura inválida foi encontrada."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
+#, fuzzy
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
-"Não foi possível executar 'apt-key' para verificar a assinatura (o gnupg "
-"está instalado?)"
+"Não foi possível executar '%s' para verificar a assinatura (o gnupg está "
+"instalado?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Erro desconhecido executando apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "As seguintes assinaturas eram inválidas:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1054,31 +1051,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Erro escrevendo para o arquivo"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Erro escrevendo para arquivo"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Seleção falhou"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Conexão expirou"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Erro escrevendo para arquivo de saída"
@@ -1086,53 +1083,295 @@ msgstr "Erro escrevendo para arquivo de saída"
msgid "Waiting for headers"
msgstr "Aguardando por cabeçalhos"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Linha de cabeçalho ruim"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "O servidor HTTP enviou um cabeçalho de resposta inválido"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor HTTP enviou um cabeçalho \"Content-Length\" inválido"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor HTTP enviou um cabeçalho \"Content-Range\" inválido"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Este servidor HTTP possui suporte a \"range\" quebrado"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Dados de cabeçalho ruins"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Conexão falhou"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Erro interno"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Corrigindo dependências..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " falhou."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Impossível corrigir dependências"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Impossível minimizar o conjunto de atualizações"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Pronto"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Você pode querer executar 'apt-get -f install' para corrigí-los."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependências desencontradas. Tente usar -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "mas %s está instalado"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "mas %s está para ser instalado"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "mas não é instalável"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "mas é um pacote virtual"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "mas não está instalado"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "mas não será instalado"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " ou"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Os pacotes a seguir têm dependências desencontradas:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Os NOVOS pacotes a seguir serão instalados:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Os pacotes a seguir serão REMOVIDOS:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Os pacotes a seguir serão atualizados:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Os pacotes a seguir serão REVERTIDOS:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Os seguintes pacotes mantidos serão mudados:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (por causa de %s) "
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"AVISO: Os pacotes essenciais a seguir serão removidos.\n"
+"Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está "
+"fazendo!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalados, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu revertidos, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu a serem removidos e %lu não atualizados.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[S/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[s/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "S"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Erro de compilação de regex - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "O comando update não leva argumentos"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Erro interno, InstallPackages foi chamado com pacotes quebrados!"
@@ -1395,248 +1634,6 @@ msgstr "O pacote %s não está instalado, então não será removido\n"
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"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Corrigindo dependências..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " falhou."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Impossível corrigir dependências"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Impossível minimizar o conjunto de atualizações"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Pronto"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Você pode querer executar 'apt-get -f install' para corrigí-los."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependências desencontradas. Tente usar -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalado]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "mas %s está instalado"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "mas %s está para ser instalado"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "mas não é instalável"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "mas é um pacote virtual"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "mas não está instalado"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "mas não será instalado"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " ou"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Os pacotes a seguir têm dependências desencontradas:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Os NOVOS pacotes a seguir serão instalados:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Os pacotes a seguir serão REMOVIDOS:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Os pacotes a seguir serão mantidos em suas versões atuais:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Os pacotes a seguir serão atualizados:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Os pacotes a seguir serão REVERTIDOS:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Os seguintes pacotes mantidos serão mudados:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (por causa de %s) "
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"AVISO: Os pacotes essenciais a seguir serão removidos.\n"
-"Isso NÃO deveria ser feito a menos que você saiba exatamente o que você está "
-"fazendo!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu pacotes atualizados, %lu pacotes novos instalados, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalados, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu revertidos, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu a serem removidos e %lu não atualizados.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[S/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[s/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "S"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Erro de compilação de regex - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "O comando update não leva argumentos"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1690,20 +1687,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Atingido "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Atingido:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Obter:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Obter:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1729,17 +1730,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Impossível ler %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1819,7 +1820,7 @@ msgstr "são importantes. Por favor, conserte-os e execute [I]nstalar novamente"
msgid "Merging available information"
msgstr "Mesclando informação disponível"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1844,46 +1845,46 @@ msgstr ""
" -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Impossível executar \"stat\" em %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Impossível escrever para %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
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:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Lista de extensão de pacotes é muito extensa"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Erro processando o diretório %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Lista de extensão de fontes é muito extensa"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Erro ao gravar cabeçalho no arquivo de conteúdo"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Erro processando conteúdo %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1965,11 +1966,11 @@ msgstr ""
" -c=? Lê o arquivo de configuração especificado.\n"
" -o=? Define uma opção de configuração arbitrária"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Nenhuma seleção combinou"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Alguns arquivos estão faltando no grupo de arquivos do pacotes '%s'"
@@ -2082,22 +2083,22 @@ msgstr " Limite DeLink de %sB atingido.\n"
msgid "Archive had no package field"
msgstr "Repositório não possuía campo pacote"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s não possui entrada override\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " mantenedor de %s é %s, não %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s não possui entrada override fonte\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s também não possui entrada override binária\n"
@@ -2183,7 +2184,7 @@ msgstr "Problema removendo %s"
msgid "Failed to rename %s to %s"
msgstr "Falhou ao renomear %s para %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2209,11 +2210,11 @@ msgstr ""
" -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Registro de pacote desconhecido!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2288,6 +2289,27 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Hash Sum incorreto"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "O driver do método %s não pode ser encontrado."
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Método %s não iniciou corretamente"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Por favor, insira o disco nomeado: '%s' na unidade '%s' e pressione enter."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2302,177 +2324,308 @@ msgstr "Você terá que executar apt-get update para corrigir estes problemas"
msgid "The list of sources could not be read."
msgstr "A lista de fontes não pode ser lida."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Cache de pacotes vazio"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "O arquivo de cache de pacotes está corrompido"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
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:163
+#: apt-pkg/pkgcache.cc:168
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "O arquivo de cache de pacotes está corrompido"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, 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:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "O cache de pacotes foi gerado para uma arquitetura diferente"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Depende"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Pré-Depende"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Sugere"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Recomenda"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Conflita"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Substitui"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Obsoleta"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Quebra"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "importante"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "requerido"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "padrão"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "opcional"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "extra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Calculando atualização"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "O driver do método %s não pode ser encontrado."
+msgid "Index file type '%s' is not supported"
+msgstr "Tipo de arquivo de índice '%s' não é suportado"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
+
+#: apt-pkg/sourcelist.cc:206
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Método %s não iniciou corretamente"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:208
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+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:211
+#, 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:217
+#, 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:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-"Por favor, insira o disco nomeado: '%s' na unidade '%s' e pressione enter."
+"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:335
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Opening %s"
+msgstr "Abrindo %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, 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:371
+#, 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:375
+#, 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:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "Tipo de arquivo de índice '%s' não é suportado"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Construindo árvore de dependências"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Impossível executar \"stat\" %s."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versões candidatas"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "O cache possui um sistema de versões incompatível"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Geração de dependência"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Lendo informação de estado"
+#: apt-pkg/pkgcachegen.cc:273
+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:276
+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:279
+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:282
+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/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s"
+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/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s"
+msgid "Couldn't stat source package list %s"
+msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Lendo listas de pacotes"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Coletando Arquivo \"Provides\""
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Erro de E/S ao gravar cache fonte"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "renomeação falhou, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Hash Sum incorreto"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Tamanho incorreto"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Operação %s inválida"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Erro de escrita"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2480,7 +2633,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
@@ -2496,49 +2649,49 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Impossível analisar arquivo de pacote %s (1)"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
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:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2548,12 +2701,12 @@ msgstr ""
"que você precisa consertar manualmente este pacote. (devido a arquitetura "
"não especificada)."
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2561,119 +2714,42 @@ msgstr ""
"Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:"
"\" para o pacote %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "O cache possui um sistema de versões incompatível"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
-
-#: apt-pkg/pkgcachegen.cc:273
-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:276
-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:279
-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:282
-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:591
-#, 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:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Lendo listas de pacotes"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Coletando Arquivo \"Provides\""
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Erro de E/S ao gravar cache fonte"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Bloco fornecedor %s não contém impressão digital (\"fingerprint\")"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Diretório de listas %spartial está faltando."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Diretório de arquivos %spartial está faltando."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Tipo de arquivo de índice '%s' não é suportado"
+msgid "Unable to lock directory %s"
+msgstr "Impossível criar trava no diretório de listas"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Obtendo o arquivo %li de %li (%s restantes)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Obtendo arquivo %li de %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-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/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Você deve colocar algumas URIs 'source' em seu sources.list"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Impossível executar \"stat\" %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2695,19 +2771,19 @@ msgstr "Não foi possível entender o tipo de \"pin\" %s"
msgid "No priority (or zero) specified for pin"
msgstr "Nenhuma prioridade (ou zero) especificada para \"pin\""
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "Não foi possível abrir arquivo %s"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2719,10 +2795,14 @@ msgstr ""
"é ruim, mas se você realmente quer fazer isso, ative a opção APT::Force-"
"LoopBreak."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linha %u muito longa na lista de fontes %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+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/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2791,11 +2871,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Copiando lista de pacotes..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Gravando nova lista de fontes\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Entradas na lista de fontes para este disco são:\n"
@@ -2807,7 +2887,7 @@ msgstr ""
"O pacote %s precisa ser reinstalado, mas não foi possível encontrar um "
"arquivo para o mesmo."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2815,144 +2895,40 @@ msgstr ""
"Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
"pacotes mantidos (hold)."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Impossível analisar arquivo de pacote %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Impossível analisar arquivo de pacote %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Impossível analisar arquivo de pacote %s (1)"
-
-#: apt-pkg/indexrecords.cc:91
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Nota, selecionando %s ao invés de %s\n"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:152
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Linha inválida no arquivo de desvios: %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Impossível analisar arquivo de pacote %s (1)"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-
-#: apt-pkg/sourcelist.cc:173
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-
-#: apt-pkg/sourcelist.cc:190
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-
-#: apt-pkg/sourcelist.cc:193
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
-
-#: apt-pkg/sourcelist.cc:206
-#, 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:208
-#, 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/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Construindo árvore de dependências"
-#: apt-pkg/sourcelist.cc:211
-#, 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/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versões candidatas"
-#: apt-pkg/sourcelist.cc:217
-#, 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/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Geração de dependência"
-#: apt-pkg/sourcelist.cc:224
-#, 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/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Lendo informação de estado"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "Abrindo %s"
+msgid "Failed to open StateFile %s"
+msgstr "Falha ao abrir Arquivo de Estado (\"StateFile\") %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Falha ao escrever Arquivo de Estado (\"StateFile\") temporário %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, 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:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Impossível analisar arquivo de pacote %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2964,208 +2940,101 @@ msgstr "Release '%s' para '%s' não foi encontrada"
msgid "Version '%s' for '%s' was not found"
msgstr "Versão '%s' para '%s' não foi encontrada"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Impossível achar tarefa %s"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Impossível achar pacote %s"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Impossível achar pacote %s"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Instalando %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Configurando %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Removendo %s"
+#: apt-pkg/indexrecords.cc:83
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Impossível analisar arquivo de pacote %s (1)"
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/indexrecords.cc:91
#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "%s completamente removido"
+msgid "No sections in Release file %s"
+msgstr "Nota, selecionando %s ao invés de %s\n"
-#: apt-pkg/deb/dpkgpm.cc:111
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Noting disappearance of %s"
+msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Executando gatilho pós-instalação %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Diretório '%s' está faltando"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/indexrecords.cc:145
#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Não foi possível abrir arquivo %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Preparando %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "Desempacotando %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "Preparando para configurar %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1012
-#, c-format
-msgid "Installed %s"
-msgstr "%s instalado"
-
-#: apt-pkg/deb/dpkgpm.cc:1017
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Preparando para a remoção de %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, c-format
-msgid "Removed %s"
-msgstr "%s removido"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Preparando para remover completamente %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1025
-#, c-format
-msgid "Completely removed %s"
-msgstr "%s completamente removido"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Linha inválida no arquivo de desvios: %s"
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
+#: apt-pkg/indexrecords.cc:164
#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Impossível escrever para %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Impossível analisar arquivo de pacote %s (1)"
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
+#, c-format
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Impossível criar trava no diretório de listas"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "%lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
+msgstr "Seleção %s não encontrada"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3300,35 +3169,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Pronto"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Seleção %s não encontrada"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Não foi possível fazer \"mmap\" de um arquivo vazio"
@@ -3390,110 +3230,266 @@ msgstr "Impossível executar \"stat\" no ponto de montagem %s"
msgid "Failed to stat the cdrom"
msgstr "Impossível executar \"stat\" no cdrom"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Abreviação de tipo desconhecida: '%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Abrindo arquivo de configuração %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, 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:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Erro de sintaxe %s:%u: Tag mal formada"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, 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:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Erro de sintaxe %s:%u: Muitos \"includes\" aninhados"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, 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:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Erro de sintaxe %s:%u: Não há suporte para a diretiva '%s'"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, fuzzy, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Erro de sintaxe %s:%u: Diretivas podem ser feitas somente no nível mais alto"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, 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/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Opção de linha de comando '%c' [de %s] é desconhecida."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, 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:171
+#: apt-pkg/contrib/cmndline.cc:174
#, 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:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Opção %s requer um argumento."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
"Opção %s: Especificação de item de configuração deve possuir um =<val>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, 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:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Opção '%s' é muito longa"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, 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:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Operação %s inválida"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Instalando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Configurando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Removendo %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "%s completamente removido"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Executando gatilho pós-instalação %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Diretório '%s' está faltando"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Não foi possível abrir arquivo %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Preparando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Desempacotando %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Preparando para configurar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "%s instalado"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Preparando para a remoção de %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "%s removido"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Preparando para remover completamente %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s completamente removido"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Impossível escrever para %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Impossível criar trava no diretório de listas"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "\"DropNode\" chamado em nó ainda ligado (\"linked\")"
@@ -3598,7 +3594,7 @@ msgstr "Este não é um arquivo DEB válido, membro '%s' faltando"
msgid "Internal error, could not locate member %s"
msgstr "Erro interno, não foi possível localizar membro %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Arquivo de controle não interpretável"
@@ -3627,23 +3623,23 @@ msgstr "Arquivo é muito pequeno"
msgid "Failed to read the archive headers"
msgstr "Falhou ao ler os cabeçalhos do arquivo"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Falhou ao criar \"pipes\""
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Falhou ao executar gzip "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Arquivo corrompido"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Checksum do arquivo tar falhou, arquivo corrompido"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Tipo de cabeçalho TAR %u desconhecido, membro %s"
diff --git a/po/ro.po b/po/ro.po
index b06fe9dfa..9b0a1494a 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ro\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2008-11-15 02:21+0200\n"
"Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -24,147 +24,147 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Pachetul %s versiunea %s are o dependență neîndeplinită:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Total nume pachete : "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid "Total package structures: "
msgstr "Total nume pachete : "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Pachete normale: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Pachete virtuale pure: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Pachete virtuale singulare: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Pachete virtuale mixte: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Lipsă: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Total versiuni distincte: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Numărul total de descrieri distincte: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Total dependențe: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Total relații versiune/fișier: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Total relații desc/fișier: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Total cartări Furnizează: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Total șiruri înglobate: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Total spațiu intern: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Total spațiu contorizat pentru: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Fișierul pachetului %s este desincronizat."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Nu s-au găsit pachete"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
#, fuzzy
msgid "You must give at least one search pattern"
msgstr "Trebuie să dați exact un șablon"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Nu s-a putut localiza pachetul %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Fișiere pachet: "
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
"Cache-ul este desincronizat, nu se poate executa x-ref pe un fișier pachet"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Pachete alese special:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(negăsit)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Instalat: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Candidează: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(niciunul)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Pachet ales special: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Tabela de versiuni:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pentru %s compilat la %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -237,21 +237,21 @@ msgstr ""
" -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:76
+#: cmdline/apt-cdrom.cc:77
#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Furnizați un nume pentru acest disc, de exemplu „Debian 2.1r1 Disk 1”"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Introduceți un disc în unitate și apăsați Enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Eșec la redenumirea lui %s în %s"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -259,7 +259,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Repetați această procedură pentru restul CD-urilor din set."
@@ -296,84 +296,79 @@ msgstr ""
" -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-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Nu pot determina starea listei surse de pachete %s"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s este marcat ca fiind instalat manual.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s este marcat ca fiind instalat manual.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Nu pot încuia directorul cu lista"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Nu s-a putut bloca directorul de descărcare"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nu s-a putut găsi o sursă pachet pentru %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -381,96 +376,96 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Sar peste fișierul deja descărcat '%s'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, 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"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Este nevoie să descărcați %sB din arhivele surselor.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Aducere sursa %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Eșec la aducerea unor arhive."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Descărcare completă și în modul doar descărcare"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, 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:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comanda de despachetare '%s' eșuată.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comanda de construire '%s' eșuată.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Procesul copil a eșuat"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Trebuie specificat cel puțin un pachet pentru a-i verifica dependențele "
"înglobate"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Eșec la prelucrarea dependențelor de compilare"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nu pot prelua informațiile despre dependențele înglobate ale lui %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nu are dependențe înglobate.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -479,7 +474,7 @@ msgstr ""
"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
"poate fi găsit"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -488,14 +483,14 @@ msgstr ""
"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
"poate fi găsit"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este "
"prea nou"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -504,7 +499,7 @@ msgstr ""
"Dependența lui %s de %s nu poate fi satisfăcută deoarece nici o versiune "
"disponibilă a pachetului %s nu poate satisface versiunile cerute"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -513,17 +508,17 @@ msgstr ""
"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
"poate fi găsit"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Dependențele înglobate pentru %s nu pot fi satisfăcute."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Eșec la prelucrarea dependențelor de compilare"
@@ -634,11 +629,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -652,52 +647,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "dar nu este instalat"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s este marcat ca fiind instalat manual.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s este marcat ca fiind instalat manual.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s este deja la cea mai nouă versiune.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s este deja la cea mai nouă versiune.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Așteptat %s, dar n-a fost acolo"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "%s este marcat ca fiind instalat manual.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "Eșec la „open” pentru %s"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -920,7 +916,7 @@ msgstr "Timpul de conectare la socket-ul de date expirat"
msgid "Unable to accept connection"
msgstr "Nu s-a putut accepta conexiune"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Problemă la calcularea dispersiei pentru fișierul"
@@ -1010,40 +1006,41 @@ msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Nu s-a putut realiza conexiunea cu %s %s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Eroare internă: Semnătură corespunzătoare, dar nu s-a putut determina "
"amprenta digitale a cheii?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Cel puțin o semnătură nevalidă a fost întâlnită."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
+#, fuzzy
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
-"Nu s-a putut executa „apt-key” pentru verificarea semnăturii (gnupg este "
+"Nu s-a putut executa „%s” pentru verificarea semnăturii (gnupg este "
"instalat?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Eroare necunoscută în timp ce se execută apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Următoarele semnături nu au fost valide:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1055,32 +1052,32 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Eroare la scrierea în fișierul"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr ""
"Eroare la citirea de la server. Conexiunea a fost închisă de la distanță"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Eroare la citirea de la server"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Eroare la scrierea în fișier"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Selecția a eșuat"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Timp de conectare expirat"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Eroare la scrierea fișierului de rezultat"
@@ -1088,53 +1085,297 @@ msgstr "Eroare la scrierea fișierului de rezultat"
msgid "Waiting for headers"
msgstr "În așteptarea antetelor"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Linie de antet necorespunzătoare"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "Serverul HTTP a trimis un antet de răspuns necorespunzător"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Serverul HTTP a trimis un antet Content-Length necorespunzător"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Serverul HTTP a trimis un antet zonă de conținut necorespunzător"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Acest server HTTP are un suport defect de intervale"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Format dată necunoscut"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Antet de date necorespunzător"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Conectare eșuată"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Eroare internă"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Corectez dependențele..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " eșec."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Nu s-au putut corecta dependențele"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Terminat"
+
+#: apt-private/private-cachefile.cc:110
+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."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dependențe neîndeplinite. Încercați să folosiți -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalat]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Instalat]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Instalat]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Instalat]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "dar %s este instalat"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "dar %s este pe cale de a fi instalat"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "dar nu este instalabil"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "dar este un pachet virtual"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "dar nu este instalat"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "dar nu este pe cale să fie instalat"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " sau"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Următoarele pachete au dependențe neîndeplinite:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Următoarele pachete NOI vor fi instalate:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Următoarele pachete vor fi ȘTERSE:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Următoarele pachete au fost reținute:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Următoarele pachete vor fi ÎNNOITE:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Următoarele pachete vor fi DE-GRADATE:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Următoarele pachete ținute vor fi schimbate:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (datorită %s) "
+
+#: apt-private/private-output.cc:696
+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!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu înnoite, %lu nou instalate, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinstalate, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu de-gradate, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu de șters și %lu neînnoite.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu instalate sau șterse incomplet.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Eroare de compilare expresie regulată - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Comanda de actualizare nu are argumente"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
@@ -1401,250 +1642,6 @@ msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Corectez dependențele..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " eșec."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Nu s-au putut corecta dependențele"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Nu s-a putut micșora mulțimea pachetelor de înnoit"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Terminat"
-
-#: apt-private/private-cachefile.cc:110
-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."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dependențe neîndeplinite. Încercați să folosiți -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Instalat]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Instalat]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Instalat]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Instalat]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "dar %s este instalat"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "dar %s este pe cale de a fi instalat"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "dar nu este instalabil"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "dar este un pachet virtual"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "dar nu este instalat"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "dar nu este pe cale să fie instalat"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " sau"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Următoarele pachete au dependențe neîndeplinite:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Următoarele pachete NOI vor fi instalate:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Următoarele pachete vor fi ȘTERSE:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Următoarele pachete au fost reținute:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Următoarele pachete vor fi ÎNNOITE:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Următoarele pachete vor fi DE-GRADATE:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Următoarele pachete ținute vor fi schimbate:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (datorită %s) "
-
-#: apt-private/private-output.cc:696
-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!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu înnoite, %lu nou instalate, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinstalate, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu de-gradate, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu de șters și %lu neînnoite.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu instalate sau șterse incomplet.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Eroare de compilare expresie regulată - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Comanda de actualizare nu are argumente"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1698,20 +1695,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Atins "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Atins:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Luat:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Luat:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ignorat "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ignorat:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Eroare"
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Eroare:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1737,17 +1738,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Nu s-a putut citi %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1824,7 +1825,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Se combină informațiile disponibile"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1848,46 +1849,46 @@ msgstr ""
" -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:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Nu se poate executa „stat” pe %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Nu s-a putut scrie în %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nu s-a putut citi versiunea debconf. Este instalat debconf?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Lista de extensii pentru pachet este prea lungă"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Eroare la prelucrarea directorului %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Lista de extensii pentru sursă este prea lungă"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Eroare la scrierea antetului în fișierul index"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Eroare la prelucrarea conținutului %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1975,11 +1976,11 @@ msgstr ""
" -c=? Citește acest fișier de configurare\n"
" -o=? Ajustează o opțiune de configurare arbitrară"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Nu s-a potrivit nici o selecție"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Unele fișiere lipsesc din grupul fișierului pachet '%s'"
@@ -2092,22 +2093,22 @@ msgstr " Limita de %sB a dezlegării a fost atinsă.\n"
msgid "Archive had no package field"
msgstr "Arhiva nu are câmp de pachet"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nu are intrare de înlocuire\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s responsabil este %s nu %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nu are nici o intrare sursă de înlocuire\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nu are nici intrare binară de înlocuire\n"
@@ -2193,7 +2194,7 @@ msgstr "Problemă la desfacerea %s"
msgid "Failed to rename %s to %s"
msgstr "Eșec la redenumirea lui %s în %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2218,11 +2219,11 @@ msgstr ""
" -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-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Înregistrare de pachet necunoscut!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2296,6 +2297,27 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Nepotrivire la suma de căutare"
+#: apt-pkg/acquire-worker.cc:133
+#, 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:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoda %s nu s-a lansat corect"
+
+#: apt-pkg/acquire-worker.cc:485
+#, 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."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2311,177 +2333,303 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "Lista surselor nu poate fi citită."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Cache gol de pachet"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Cache-ul fișierului pachet este deteriorat"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Fișierul cache al pachetului este o versiune incompatibilă"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "Cache-ul fișierului pachet este deteriorat"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Acest APT nu suportă versioning system '%s'"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Cache-ul pachetului a fost construit pentru o arhitectură diferită"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Depinde"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Pre-depinde"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Sugerează"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Recomandă"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Este în conflict"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Înlocuiește"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Învechit"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Corupe"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "important"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "cerut"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "opțional"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "extra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Calculez înnoirea"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Metoda driver %s nu poate fi găsită."
+msgid "Index file type '%s' is not supported"
+msgstr "Tipul de fișier index '%s' nu este suportat"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Linie greșită %lu în lista sursă %s (dist)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
+
+#: apt-pkg/sourcelist.cc:206
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoda %s nu s-a lansat corect"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Linie greșită %lu în lista sursă %s (URI)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:208
#, 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."
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Linie greșită %lu în lista sursă %s (dist)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Deschidere %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Linia %u prea lungă în lista sursă %s."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Linie greșită %u în lista sursă %s (tip)"
+
+#: apt-pkg/sourcelist.cc:375
+#, 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:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "Tipul de fișier index '%s' nu este suportat"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Se construiește arborele de dependență"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nu pot determina starea %s."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Versiuni candidat"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Cache are un versioning system incompatibil"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generare dependențe"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Se citesc informațiile de stare"
+#: apt-pkg/pkgcachegen.cc:273
+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 "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:276
+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."
+
+#: apt-pkg/pkgcachegen.cc:279
+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:282
+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."
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Eșec la deschiderea fișierului de stare %s"
+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"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Eșec la scrierea fișierului temporar de stare %s"
+msgid "Couldn't stat source package list %s"
+msgstr "Nu pot determina starea listei surse de pachete %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Citire liste de pachete"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Colectare furnizori fișier"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Eroare IO în timpul salvării sursei cache"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "redenumire eșuată, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Nepotrivire la suma de căutare"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Nepotrivire dimensiune"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Operațiune invalidă %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Eroare de scriere"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2489,7 +2637,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
@@ -2505,51 +2653,51 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
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:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2558,12 +2706,12 @@ msgstr ""
"N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna "
"că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2571,119 +2719,42 @@ msgstr ""
"Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la "
"pachetul %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Cache are un versioning system incompatibil"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:273
-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 "
-"APT."
-
-#: apt-pkg/pkgcachegen.cc:276
-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."
-
-#: apt-pkg/pkgcachegen.cc:279
-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:282
-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."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, 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"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nu pot determina starea listei surse de pachete %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Citire liste de pachete"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Colectare furnizori fișier"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Eroare IO în timpul salvării sursei cache"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Blocul vânzător %s nu conține amprentă"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Directorul de liste %spartial lipsește."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Directorul de arhive %spartial lipsește."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Tipul de fișier index '%s' nu este suportat"
+msgid "Unable to lock directory %s"
+msgstr "Nu pot încuia directorul cu lista"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Se descarcă fișierul %li din %li (%s rămas)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Se descarcă fișierul %li din %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-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/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Trebuie să puneți niște 'surse' de URI în sources.list"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nu pot determina starea %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2705,19 +2776,19 @@ msgstr "Nu s-a înțeles tipul de pin %s"
msgid "No priority (or zero) specified for pin"
msgstr "Fără prioritate (sau zero) specificată pentru pin"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "Nu s-a putut deschide fișierul %s"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2729,10 +2800,14 @@ msgstr ""
"nu-i de bine, dar dacă vreți întradevăr s-o faceți, activați opțiunea APT::"
"Force-LoopBreak."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linia %u prea lungă în lista sursă %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+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/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2802,11 +2877,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Copiez listele de pachete.."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Scriere noua listă sursă\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Intrările listei surselor pentru acest disc sunt:\n"
@@ -2817,7 +2892,7 @@ msgid ""
msgstr ""
"Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2825,139 +2900,40 @@ msgstr ""
"Eroare, pkgProblemResolver::Resolve a generat întreruperi, aceasta poate fi "
"cauzată de pachete ținute."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "Nu pot corecta problema, ați ținut pachete deteriorate."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Nu s-a putut analiza fișierul pachet %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
-
-#: apt-pkg/indexrecords.cc:91
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Notă, se selectează %s în locul lui %s\n"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:152
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Linie necorespunzătoare în fișierul-redirectare: %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Linie greșită %lu în lista sursă %s (analiza URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-
-#: apt-pkg/sourcelist.cc:173
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Linie greșită %lu în lista sursă %s (dist)"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-
-#: apt-pkg/sourcelist.cc:190
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-
-#: apt-pkg/sourcelist.cc:193
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Linie greșită %lu în lista sursă %s (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Linie greșită %lu în lista sursă %s (dist)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Se construiește arborele de dependență"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Linie greșită %lu în lista sursă %s (analiza URI)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Versiuni candidat"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generare dependențe"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Se citesc informațiile de stare"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "Deschidere %s"
+msgid "Failed to open StateFile %s"
+msgstr "Eșec la deschiderea fișierului de stare %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Linie greșită %u în lista sursă %s (tip)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Eșec la scrierea fișierului temporar de stare %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, 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:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Nu s-a putut analiza fișierul pachet %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2969,208 +2945,101 @@ msgstr "Release '%s' pentru '%s' n-a fost găsită"
msgid "Version '%s' for '%s' was not found"
msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Nu s-a putut găsi sarcina %s"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nu pot găsi pachetul %s"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Nu pot găsi pachetul %s"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Se instalează %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Se configurează %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Se șterge %s"
+#: apt-pkg/indexrecords.cc:83
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/indexrecords.cc:91
#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Șters complet %s"
+msgid "No sections in Release file %s"
+msgstr "Notă, se selectează %s în locul lui %s\n"
-#: apt-pkg/deb/dpkgpm.cc:111
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Noting disappearance of %s"
+msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Se rulează declanșatorul post-instalare %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Directorul „%s” lipsește."
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/indexrecords.cc:145
#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Nu s-a putut deschide fișierul %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Se pregătește %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "Se despachetează %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "Se pregătește configurarea %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1012
-#, c-format
-msgid "Installed %s"
-msgstr "Instalat %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1017
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Se pregătește ștergerea lui %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, c-format
-msgid "Removed %s"
-msgstr "Șters %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Se pregătește ștergerea completă a %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1025
-#, c-format
-msgid "Completely removed %s"
-msgstr "Șters complet %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Linie necorespunzătoare în fișierul-redirectare: %s"
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
+#: apt-pkg/indexrecords.cc:164
#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Nu s-a putut scrie în %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
+#, c-format
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
+#, c-format
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Nu pot încuia directorul cu lista"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "%lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
+msgstr "Selecția %s nu a fost găsită"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3305,35 +3174,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Terminat"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Selecția %s nu a fost găsită"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Nu s-a putut executa „mmap” cu un fișier gol"
@@ -3395,110 +3235,266 @@ msgstr "Nu pot determina starea punctului de montare %s"
msgid "Failed to stat the cdrom"
msgstr "Eșec la „stat” pentru CD"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Abreviere de tip nerecunoscut: „%c”"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Se deschide fișierul de configurare %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, 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:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Eroare de sintaxă %s:%u: etichetă greșită"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, 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:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, 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:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Eroare de sintaxă %s:%u: incluse de aici"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, fuzzy, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Eroare de sintaxă %s:%u: Directivele pot fi date doar la nivelul superior"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, 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"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Opțiunea linie de comandă '%c' [din %s] este necunoscută."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Opțiunea linie de comandă %s nu este înțeleasă"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Opțiunea linie de comandă %s nu este booleană"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Opțiunea %s necesită un argument"
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
"Opțiunea %s: Specificația configurării articolului trebuie să aibă o =<val>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "Opțiunea %s necesită un argument integru, nu '%s'"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Opțiunea '%s' este prea lungă"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, 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)."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Operațiune invalidă %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Se instalează %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Se configurează %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Se șterge %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Șters complet %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Se rulează declanșatorul post-instalare %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Directorul „%s” lipsește."
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Nu s-a putut deschide fișierul %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Se pregătește %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Se despachetează %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Se pregătește configurarea %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "Instalat %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Se pregătește ștergerea lui %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "Șters %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Se pregătește ștergerea completă a %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "Șters complet %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Nu s-a putut scrie în %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nu pot încuia directorul cu lista"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "S-a chemat DropNode pe un nod încă „legat”"
@@ -3605,7 +3601,7 @@ msgstr "Aceasta nu este o arhivă DEB validă, lipsește membrul „%s”"
msgid "Internal error, could not locate member %s"
msgstr "Eroare internă, nu pot localiza membrul %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Fișier de control neanalizabil"
@@ -3634,24 +3630,24 @@ msgstr "Arhiva este prea scurtă"
msgid "Failed to read the archive headers"
msgstr "Eșec la citirea antetelor arhivei"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Eșec la crearea conexiunilor"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Eșec la executarea lui gzip "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Arhivă deteriorată"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr ""
"Suma de control a arhivei tar nu s-a verificat, arhiva este deteriorată"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Tip antet TAR %u necunoscut, membrul %s"
diff --git a/po/ru.po b/po/ru.po
index c00fc3bdb..2028e5420 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt rev2227.1.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2012-06-30 08:47+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -30,144 +30,144 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Пакет %s версии %s имеет неудовлетворённую зависимость:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Всего имён пакетов: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Всего структур пакетов: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Обычных пакетов: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Полностью виртуальных пакетов: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Одиночных виртуальных пакетов: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Смешанных виртуальных пакетов: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Отсутствует: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Всего уникальных версий: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Всего уникальных описаний: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Всего зависимостей: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Всего отношений Версия/Файл: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Всего отношений Описание/Файл: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Всего отношений Provides: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Всего развёрнутых строк: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Пустого места в кэше: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Полное учтённое пространство: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Список пакетов %s рассинхронизирован."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Не найдено ни одного пакета"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Вы должны задать не менее одно шаблона поиска"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Эта команда устарела. Используйте вместо неё «apt-mark showauto»."
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Не удалось найти пакет %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Списки пакетов:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "Кэш рассинхронизирован, невозможно обнаружить ссылку на список пакетов"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Зафиксированные пакеты:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(не найдено)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Установлен: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Кандидат: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(отсутствует)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Фиксатор пакета: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Таблица версий:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s для %s скомпилирован %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -237,20 +237,20 @@ msgstr ""
" -o=? Задать значение произвольной настройки, например, -o dir::cache=/tmp\n"
"Подробности в справочных страницах apt-cache(8) и apt.conf(5).\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Задайте имя для этого диска, например «Debian 5.0.3 Disk 1»"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Вставьте диск в устройство и нажмите ввод"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Не удалось примонтировать «%s» к «%s»"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -258,7 +258,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Повторите этот процесс для всех имеющихся CD."
@@ -295,48 +295,48 @@ msgstr ""
" -o=? Задать значение произвольной настройке, например, -o dir::cache=/"
"tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Не удалось найти пакет по регулярному выражению «%s»"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Не удалось найти пакет по регулярному выражению «%s»"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Не удалось найти пакет по регулярному выражению «%s»"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Используется «%s» в качестве исходного пакета вместо «%s»\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Игнорируется недоступная версия «%s» пакета «%s»"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Не удалось найти пакет %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s установлен вручную.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s выбран для автоматической установки.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -344,30 +344,25 @@ msgstr ""
"Эта команда устарела. Используйте вместо неё «apt-mark auto» и «apt-mark "
"manual»."
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Внутренняя ошибка, решатель проблем всё поломал"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Невозможно заблокировать каталог %s"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Укажите как минимум один пакет, исходный код которого необходимо получить"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Невозможно найти пакет с исходным кодом для %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -376,7 +371,7 @@ msgstr ""
"ВНИМАНИЕ: упаковка «%s» поддерживается в системе контроля версий «%s»:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -387,69 +382,69 @@ msgstr ""
"bzr branch %s\n"
"для получения последних (возможно не выпущенных) обновлений пакета.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускаем уже скачанный файл «%s»\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Необходимо получить %sб архивов исходного кода.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Получение исходного кода %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Некоторые архивы не удалось получить."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Указан режим «только скачивание», и скачивание завершено"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда распаковки «%s» завершилась неудачно.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда сборки «%s» завершилась неудачно.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Порождённый процесс завершился неудачно"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Для проверки зависимостей для сборки необходимо указать как минимум один "
"пакет"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -458,27 +453,27 @@ msgstr ""
"У %s отсутствует информация об архитектуре. Для её настройки смотрите apt."
"conf(5) APT::Architectures"
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Обработка зависимостей для сборки завершилась неудачно"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Невозможно получить информацию о зависимостях для сборки %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не имеет зависимостей для сборки.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -487,7 +482,7 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как %s не "
"разрешён для пакетов «%s»"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -496,14 +491,14 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
"найден"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
"пакет %s новее, чем надо"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -512,7 +507,7 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как версия-"
"кандидат пакета %s не может удовлетворить требованиям по версии"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -521,17 +516,17 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
"имеет версии-кандидата"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимости для сборки %s не могут быть удовлетворены."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Обработка зависимостей для сборки завершилась неудачно"
@@ -646,11 +641,11 @@ msgid "Must specify at least one pair url/filename"
msgstr ""
"Укажите как минимум один пакет, исходный код которого необходимо получить"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -664,53 +659,54 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "%s не может быть помечен, так он не установлен.\n"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s уже помечен как установленный вручную.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s уже помечен как установленный автоматически.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr "%s уже помечен как зафиксированный.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr "%s уже помечен как не зафиксированный.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Ожидалось завершение процесса %s, но он не был запущен"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr "%s помечен как зафиксированный.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "Отмена фиксации для %s.\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
"Выполнение dpkg завершилось с ошибкой. У вас есть права суперпользователя?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -957,7 +953,7 @@ msgstr "Время установления соединения для соке
msgid "Unable to accept connection"
msgstr "Невозможно принять соединение"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Проблема при хешировании файла"
@@ -1046,39 +1042,39 @@ msgstr "Что-то странное произошло при определе
msgid "Unable to connect to %s:%s:"
msgstr "Невозможно соединиться с %s: %s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток "
"ключа?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Найдена как минимум одна неправильная подпись."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"Не удалось выполнить «apt-key» для проверки подписи (gnupg установлена?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Неизвестная ошибка при выполнении apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Следующие подписи неверные:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1090,31 +1086,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr "Пустые файлы не могут быть допустимыми архивами"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Ошибка записи в файл"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Ошибка чтения, удалённый сервер прервал соединение"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Ошибка чтения с сервера"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Ошибка записи в файл"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Ошибка в select"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Время ожидания для соединения истекло"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Ошибка записи в выходной файл"
@@ -1122,53 +1118,304 @@ msgstr "Ошибка записи в выходной файл"
msgid "Waiting for headers"
msgstr "Ожидание заголовков"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Неверный заголовок"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "Http-сервер послал неверный заголовок"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http сервер послал неверный заголовок Content-Length"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-сервер послал неверный заголовок Content-Range"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Этот HTTP-сервер не поддерживает скачивание фрагментов файлов"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Неизвестный формат данных"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Неверный заголовок данных"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Соединение разорвано"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Внутренняя ошибка"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Исправление зависимостей…"
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " не удалось."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Невозможно скорректировать зависимости"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Невозможно минимизировать набор обновлений"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Готово"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
+"f install»."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Установлен]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Установлен]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Установлен]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Установлен]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "но %s уже установлен"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "но %s будет установлен"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "но он не может быть установлен"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "но это виртуальный пакет"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "но он не установлен"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "но он не будет установлен"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " или"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Пакеты, имеющие неудовлетворённые зависимости:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "НОВЫЕ пакеты, которые будут установлены:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Пакеты, которые будут УДАЛЕНЫ:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Пакеты, которые будут оставлены в неизменном виде:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Пакеты, которые будут обновлены:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr ""
+"Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (вследствие %s) "
+
+#: apt-private/private-output.cc:696
+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"
+"НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "обновлено %lu, установлено %lu новых пакетов, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "переустановлено %lu переустановлено, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu пакетов заменены на старые версии, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "не установлено до конца или удалено %lu пакетов.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[Д/н]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "д"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "н"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Ошибка компиляции регулярного выражения — %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Команде update не нужны аргументы"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"ЗАМЕЧАНИЕ: Производить только имитация работы!\n"
+" Для реальной работы apt-get требуются права суперпользователя.\n"
+" Учтите, что блокировка не используется,\n"
+" поэтому нет полного соответствия с текущей реальной ситуацией!"
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1442,257 +1689,6 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Пакет «%s» не установлен, поэтому не может быть удалён\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Исправление зависимостей…"
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " не удалось."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Невозможно скорректировать зависимости"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Невозможно минимизировать набор обновлений"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Готово"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Возможно, для исправления этих ошибок вы захотите воспользоваться «apt-get -"
-"f install»."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Неудовлетворённые зависимости. Попытайтесь использовать -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Установлен]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Установлен]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Установлен]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Установлен]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "но %s уже установлен"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "но %s будет установлен"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "но он не может быть установлен"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "но это виртуальный пакет"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "но он не установлен"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "но он не будет установлен"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " или"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Пакеты, имеющие неудовлетворённые зависимости:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "НОВЫЕ пакеты, которые будут установлены:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Пакеты, которые будут УДАЛЕНЫ:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Пакеты, которые будут оставлены в неизменном виде:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Пакеты, которые будут обновлены:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Пакеты, будут заменены на более СТАРЫЕ версии:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr ""
-"Пакеты, которые должны были бы остаться без изменений, но будут заменены:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (вследствие %s) "
-
-#: apt-private/private-output.cc:696
-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"
-"НЕ ДЕЛАЙТЕ этого, если вы НЕ представляете себе все возможные последствия!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "обновлено %lu, установлено %lu новых пакетов, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "переустановлено %lu переустановлено, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu пакетов заменены на старые версии, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "для удаления отмечено %lu пакетов, и %lu пакетов не обновлено.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "не установлено до конца или удалено %lu пакетов.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[Д/н]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "д"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "н"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Ошибка компиляции регулярного выражения — %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Команде update не нужны аргументы"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"ЗАМЕЧАНИЕ: Производить только имитация работы!\n"
-" Для реальной работы apt-get требуются права суперпользователя.\n"
-" Учтите, что блокировка не используется,\n"
-" поэтому нет полного соответствия с текущей реальной ситуацией!"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1746,20 +1742,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "В кэше "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "В кэше:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Получено:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Получено:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Игн "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Игн:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Ош "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Ош:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1785,17 +1785,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Невозможно прочитать %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1871,7 +1871,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Слияние доступной информации"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1894,47 +1894,47 @@ msgstr ""
" -c=? Читать указанный файл настройки\n"
" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Невозможно получить атрибуты %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Невозможно записать в %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Невозможно определить версию debconf. Он установлен?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Список расширений, допустимых для пакетов, слишком длинен"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Ошибка обработки каталога %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Список расширений источников слишком длинен"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr ""
"Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "ошибка обработки полного перечня содержимого пакетов (Contents) %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -2020,11 +2020,11 @@ msgstr ""
" -c=? Использовать указанный файл настройки\n"
" -o=? Задать значение произвольному параметру настройки"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Совпадений не обнаружено"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "В группе пакетов «%s» отсутствуют некоторые файлы"
@@ -2136,22 +2136,22 @@ msgstr " Превышен лимит в %sB в DeLink.\n"
msgid "Archive had no package field"
msgstr "В архиве нет поля package"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " Нет записи о переназначении (override) для %s\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " пакет %s сопровождает %s, а не %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " Нет записи source override для %s\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " Нет записи binary override для %s\n"
@@ -2238,7 +2238,7 @@ msgstr "Не удалось удалить %s"
msgid "Failed to rename %s to %s"
msgstr "Не удалось переименовать %s в %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2262,11 +2262,11 @@ msgstr ""
" -c=? Читать указанный файл настройки\n"
" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Запись о неизвестном пакете!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2341,6 +2341,26 @@ msgstr "Не удалось найти аутентификационную за
msgid "Hash mismatch for: %s"
msgstr "Не совпадает хеш сумма для: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Драйвер для метода %s не найден."
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Метод %s запустился не корректно"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Вставьте диск с меткой «%s» в устройство «%s» и нажмите ввод."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "Списки пакетов или файл состояния не могут быть открыты или прочитаны."
@@ -2353,176 +2373,307 @@ msgstr "Вы можете запустить «apt-get update» для испр
msgid "The list of sources could not be read."
msgstr "Не читается перечень источников."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Кэш пакетов пуст"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Кэш пакетов повреждён"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Не поддерживаемая версия кэша пакетов"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr "Кэш пакетов повреждён, он слишком мал"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Эта версия APT не поддерживает систему версий «%s»"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Кэш пакетов был собран для другой архитектуры"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Зависит"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "ПредЗависит"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Предлагает"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Рекомендует"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Конфликтует"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Заменяет"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Замещает"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Ломает"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Улучшает"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "важный"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "необходимый"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "стандартный"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "необязательный"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "дополнительный"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Расчёт обновлений"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Драйвер для метода %s не найден."
+msgid "Index file type '%s' is not supported"
+msgstr "Не поддерживается индексный файл типа «%s»"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Проверьте, установлен ли пакет «dpkg-dev».\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Метод %s запустился не корректно"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Искажённая строка %lu в списке источников %s ([параметр] неразбираем)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Вставьте диск с меткой «%s» в устройство «%s» и нажмите ввод."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+"Искажённая строка %lu в списке источников %s ([параметр] слишком короткий)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Искажённая строка %lu в списке источников %s (([%s] не назначаем)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Искажённая строка %lu в списке источников %s ([%s] не имеет ключа)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Искажённая строка %lu в списке источников %s (([%s] ключ %s не имеет "
+"значения)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr ""
+"Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Искажённая строка %lu в списке источников %s (absolute dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Искажённая строка %lu в списке источников %s (dist parse)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Открытие %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Строка %u в списке источников %s слишком длинна."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Искажённая строка %u в списке источников %s (тип)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "Не поддерживается индексный файл типа «%s»"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Построение дерева зависимостей"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Невозможно получить атрибуты %s."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Версии-кандидаты"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Кэш имеет несовместимую систему версий"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Генерирование зависимостей"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Произошла ошибка во время обработки %s (%s%d)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Чтение информации о состоянии"
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Превышено допустимое количество имён пакетов, которое способен обработать "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+"Превышено допустимое количество версий, которое способен обработать APT."
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Превышено допустимое количество описаний, которое способен обработать APT."
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Превышено допустимое количество зависимостей, которое способен обработать "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Не удалось открыть StateFile %s"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Во время обработки файла зависимостей не найден пакет %s %s"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Не удалось записать временный StateFile %s"
+msgid "Couldn't stat source package list %s"
+msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Чтение списков пакетов"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Сбор информации о Provides"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Отправка сценария решателю"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Отправка запроса решателю"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Подготовка к приёму решения"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "Запустить внешний решатель"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "переименовать не удалось, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Хеш сумма не совпадает"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Не совпадает размер"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Неверная операция %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Ошибка записи"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
#, fuzzy
msgid "Does not start with a cleartext signature"
msgstr "Файл %s не начинается с прозрачно подписанного сообщения"
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2532,7 +2683,7 @@ msgstr ""
"использованы предыдущие индексные файлы. Ошибка GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "Ошибка GPG: %s: %s"
@@ -2548,14 +2699,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2564,16 +2715,16 @@ msgstr ""
"Невозможно найти ожидаемый элемент «%s» в файле Release (некорректная запись "
"в sources.list или файл)"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Невозможно найти хеш-сумму «%s» в файле Release"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "Недоступен открытый ключ для следующих ID ключей:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2582,19 +2733,19 @@ msgstr ""
"Файл Release для %s просрочен (недостоверный начиная с %s). Обновление этого "
"репозитория производиться не будет."
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфликт распространения: %s (ожидался %s, но получен %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2603,129 +2754,53 @@ msgstr ""
"Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся "
"вручную исправить этот пакет (возможно, пропущен arch)"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Невозможно найти источник для загрузки «%2$s» версии «%1$s»"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Кэш имеет несовместимую систему версий"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Произошла ошибка во время обработки %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Превышено допустимое количество имён пакетов, которое способен обработать "
-"APT."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Превышено допустимое количество версий, которое способен обработать APT."
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Превышено допустимое количество описаний, которое способен обработать APT."
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Превышено допустимое количество зависимостей, которое способен обработать "
-"APT."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Во время обработки файла зависимостей не найден пакет %s %s"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Чтение списков пакетов"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Сбор информации о Provides"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Блок поставщика %s не содержит отпечатка (fingerprint)"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Каталог списка %spartial отсутствует."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Архивный каталог %spartial отсутствует."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Не поддерживается индексный файл типа «%s»"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "Невозможно заблокировать каталог %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Скачивается файл %li из %li (осталось %s)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Скачивается файл %li из %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Некоторые индексные файлы не скачались. Они были проигнорированы или вместо "
-"них были использованы старые версии."
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Вы должны заполнить sources.list, поместив туда URI источников пакетов"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Невозможно получить атрибуты %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2749,7 +2824,7 @@ msgstr "Неизвестный тип фиксации %s"
msgid "No priority (or zero) specified for pin"
msgstr "Для фиксации не указан приоритет (или указан нулевой)"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2758,12 +2833,12 @@ msgstr ""
"Не удалось выполнить оперативную настройку «%s». Подробней, смотрите в man 5 "
"apt.conf о APT::Immediate-Configure. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr "Не удалось настроить «%s»."
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2776,10 +2851,13 @@ msgstr ""
"Если вы действительно хотите продолжить, установите параметр APT::Force-"
"LoopBreak."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Строка %u в списке источников %s слишком длинна."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Некоторые индексные файлы не скачались. Они были проигнорированы или вместо "
+"них были использованы старые версии."
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2850,11 +2928,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Копирование списков пакетов…"
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Запись нового списка источников\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Записи в списке источников для этого диска:\n"
@@ -2865,7 +2943,7 @@ msgid ""
msgstr ""
"Пакет %s нуждается в переустановке, но найти архив для него не удалось."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2873,143 +2951,40 @@ msgstr ""
"Ошибка, pkgProblemResolver::Resolve сгенерировал повреждённые пакеты. Это "
"может быть вызвано отложенными (held) пакетами."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "Невозможно исправить ошибки, у вас отложены (held) битые пакеты."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "Отправка сценария решателю"
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr "Отправка запроса решателю"
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr "Подготовка к приёму решения"
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr "Внешний решатель завершился с ошибкой не передав сообщения об ошибке"
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr "Запустить внешний решатель"
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Невозможно разобрать содержимое пакета %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Невозможно разобрать содержимое пакета %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Невозможно разобрать содержимое файла Release (%s)"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Отсутствуют разделы в файле Release (%s)"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Отсутствуют элементы Hash в файле Release (%s)"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Неправильный элемент «Valid-Until» в файле Release %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Неправильный элемент «Date» в файле Release %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Искажённая строка %lu в списке источников %s ([параметр] неразбираем)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Искажённая строка %lu в списке источников %s ([параметр] слишком короткий)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Искажённая строка %lu в списке источников %s (([%s] не назначаем)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Искажённая строка %lu в списке источников %s ([%s] не имеет ключа)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Искажённая строка %lu в списке источников %s (([%s] ключ %s не имеет "
-"значения)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
-"Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Построение дерева зависимостей"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Искажённая строка %lu в списке источников %s (анализ URI)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Версии-кандидаты"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Искажённая строка %lu в списке источников %s (absolute dist)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Генерирование зависимостей"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Искажённая строка %lu в списке источников %s (dist parse)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Чтение информации о состоянии"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "Открытие %s"
+msgid "Failed to open StateFile %s"
+msgstr "Не удалось открыть StateFile %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Искажённая строка %u в списке источников %s (тип)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Не удалось записать временный StateFile %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
-
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Неизвестный тип «%s» в строке %u в списке источников %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Невозможно разобрать содержимое пакета %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -3021,49 +2996,49 @@ msgstr "Выпуск «%s» для «%s» не найден"
msgid "Version '%s' for '%s' was not found"
msgstr "Версия «%s» для «%s» не найдена"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Не удалось найти задачу «%s»"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Не удалось найти пакет по регулярному выражению «%s»"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Не удалось найти пакет по регулярному выражению «%s»"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Не удалось выбрать версии из пакета «%s», так как он полностью виртуальный"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Не удалось выбрать самую новую версию из пакета «%s», так как он полностью "
"виртуальный"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Не удалось выбрать самую версию кандидата из пакета %s, так как у него нет "
"кандидатов"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Не удалось выбрать установленную версию из пакета %s, так как он не "
"установлен"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3072,183 +3047,59 @@ msgstr ""
"Не удалось выбрать ни установленную, ни версию кандидата из пакета «%s», так "
"как в нём нет ни той, ни другой"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Устанавливается %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Настраивается %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Удаляется %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "Выполняется полное удаление %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Уведомление об исчезновении %s"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Выполняется послеустановочный триггер %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Отсутствует каталог «%s»"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Не удалось открыть файл «%s»"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Подготавливается %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Unpacking %s"
-msgstr "Распаковывается %s"
+msgid "Unable to parse Release file %s"
+msgstr "Невозможно разобрать содержимое файла Release (%s)"
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Preparing to configure %s"
-msgstr "Подготавливается для настройки %s"
+msgid "No sections in Release file %s"
+msgstr "Отсутствуют разделы в файле Release (%s)"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Installed %s"
-msgstr "Установлен %s"
+msgid "No Hash entry in Release file %s"
+msgstr "Отсутствуют элементы Hash в файле Release (%s)"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Подготавливается для удаления %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Неправильный элемент «Valid-Until» в файле Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Removed %s"
-msgstr "Удалён %s"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Неправильный элемент «Date» в файле Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Подготовка к полному удалению %s"
+msgid "%lid %lih %limin %lis"
+msgstr "%liд %liч %liмин %liс"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Completely removed %s"
-msgstr "%s полностью удалён"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Невозможно записать в %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr "Действие прервано до его завершения"
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr "Отчёты apport не записаны, так достигнут MaxReports"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "проблемы с зависимостями — оставляем ненастроенным"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Отчёты apport не записаны, так как сообщение об ошибке указывает на "
-"повторную ошибку от предыдущего отказа."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
-"места на диске"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
-"памяти"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
-"места на диске"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Отчёты apport не записаны, так как получено сообщение об ошибке об ошибке "
-"ввода-выводы dpkg"
+msgid "%lih %limin %lis"
+msgstr "%liч %liмин %liс"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Не удалось выполнить блокировку управляющего каталога (%s); он уже "
-"используется другим процессом?"
+msgid "%limin %lis"
+msgstr "%liмин %liс"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Не удалось выполнить блокировку управляющего каталога (%s); у вас есть права "
-"суперпользователя?"
+msgid "%lis"
+msgstr "%liс"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"Работа dpkg прервана, вы должны вручную запустить «%s» для устранения "
-"проблемы. "
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Не заблокирован"
+msgid "Selection %s not found"
+msgstr "Не найдено: %s"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3391,35 +3242,6 @@ msgstr "…"
msgid "%c%s... %u%%"
msgstr "%c%s… %u%%"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%liд %liч %liмин %liс"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liч %liмин %liс"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%liмин %liс"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%liс"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Не найдено: %s"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Невозможно отобразить в память пустой файл"
@@ -3484,111 +3306,284 @@ msgstr "Невозможно прочитать атрибуты точки мо
msgid "Failed to stat the cdrom"
msgstr "Невозможно получить атрибуты cdrom"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Неизвестная аббревиатура типа: «%c»"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Открытие файла настройки %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Синтаксическая ошибка %s:%u: в начале блока нет имени."
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Синтаксическая ошибка %s:%u: искажённый тег"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Синтаксическая ошибка %s:%u: лишние символы после значения"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Синтаксическая ошибка %s:%u: директивы могут задаваться только на верхнем "
"уровне"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Синтаксическая ошибка %s:%u: слишком много вложенных include"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Синтаксическая ошибка %s:%u вызвана include из этого места"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Синтаксическая ошибка %s:%u: не поддерживаемая директива «%s»"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Синтаксическая ошибка %s:%u: для директивы clear требуется третий параметр в "
"качестве аргумента"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Синтаксическая ошибка %s:%u: лишние символы в конце файла"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Неизвестный параметр командной строки «%c» [из %s]."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Не распознанный параметр командной строки %s"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Параметр командной строки %s — не логический переключатель \"да/нет\""
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Для параметра %s требуется аргумент."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Значение параметра %s должно иметь вид =<val>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "Для параметра %s требуется аргумент в виде целого числа, а не «%s»"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Параметр «%s» слишком длинный"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "Смысл %s не ясен, используйте true или false."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Неверная операция %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Устанавливается %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Настраивается %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Удаляется %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "Выполняется полное удаление %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Уведомление об исчезновении %s"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Выполняется послеустановочный триггер %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Отсутствует каталог «%s»"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Не удалось открыть файл «%s»"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Подготавливается %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Распаковывается %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Подготавливается для настройки %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "Установлен %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Подготавливается для удаления %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "Удалён %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Подготовка к полному удалению %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s полностью удалён"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Невозможно записать в %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "Действие прервано до его завершения"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr "Отчёты apport не записаны, так достигнут MaxReports"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "проблемы с зависимостями — оставляем ненастроенным"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Отчёты apport не записаны, так как сообщение об ошибке указывает на "
+"повторную ошибку от предыдущего отказа."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
+"места на диске"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
+"памяти"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Отчёты apport не записаны, так как получено сообщение об ошибке о нехватке "
+"места на диске"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Отчёты apport не записаны, так как получено сообщение об ошибке об ошибке "
+"ввода-выводы dpkg"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Не удалось выполнить блокировку управляющего каталога (%s); он уже "
+"используется другим процессом?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+"Не удалось выполнить блокировку управляющего каталога (%s); у вас есть права "
+"суперпользователя?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"Работа dpkg прервана, вы должны вручную запустить «%s» для устранения "
+"проблемы. "
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Не заблокирован"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "DropNode вызван для узла, который ещё используется"
@@ -3693,7 +3688,7 @@ msgstr "Это неправильный DEB-архив — отсутствуе
msgid "Internal error, could not locate member %s"
msgstr "Внутренняя ошибка, не удалось найти составную часть %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Не удалось прочесть содержимое control-файла"
@@ -3722,23 +3717,23 @@ msgstr "Слишком короткий архив"
msgid "Failed to read the archive headers"
msgstr "Не удалось прочитать заголовки архива"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Не удалось создать каналы"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Не удалось выполнить gzip "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Повреждённый архив"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Неправильная контрольная сумма Tar, архив повреждён"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Неизвестный заголовок в архиве TAR. Тип %u, элемент %s"
diff --git a/po/sk.po b/po/sk.po
index e99246bee..631ddd826 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2012-06-28 20:49+0100\n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -25,146 +25,146 @@ msgstr ""
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:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Celkom názvov balíkov: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Celkom štruktúr balíkov: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Normálnych balíkov: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Čisto virtuálnych balíkov: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Jednoduchých virtuálnych balíkov: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Zmiešaných virtuálnych balíkov: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Chýbajúcich: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Celkom rôznych verzií: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Celkom rôznych popisov: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Celkom závislostí: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Celkom vzťahov ver/súbor: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Celkom vzťahov popis/súbor: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Celkom poskytnutých mapovaní: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Celkom globovaných reťazcov: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Celkom jalového miesta: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Celkom priradeného miesta: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Súbor balíkov %s je neaktuálny."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Neboli nájdené žiadne balíky"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Musíte zadať aspoň jeden vyhľadávací vzor"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
"Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark "
"showauto“."
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Nedá sa nájsť balík %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Súbory balíka:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "Vyrovnávacia pamäť je neaktuálna, nedá sa odvolať na súbor balíka"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Pripevnené balíky:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(nenájdené)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Nainštalovaná verzia: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Kandidát: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(žiadna)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Pripevnený balík:"
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Tabuľka verzií:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pre %s skompilovaný %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -235,20 +235,20 @@ msgstr ""
"Ďalšie informácie nájdete v manuálových stránkach apt-cache(8)\n"
"a apt.conf(5).\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Prosím, zadajte názov tohto disku, napríklad „Debian 5.0.3 Disk 1“"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Vložte disk do mechaniky a stlačte Enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Pripojenie „%s“ na „%s“ zlyhalo"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -256,7 +256,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Zopakujte tento postup pre všetky CD v sade diskov."
@@ -292,48 +292,48 @@ msgstr ""
" -c=? Načíta tento konfiguračný súbor\n"
" -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Vyberá sa „%s“ ako zdrojový balík namiesto „%s“\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Ignorovať nedostupnú verziu „%s“ balíka „%s“"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Balík %s sa nedá nájsť"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s je označený ako manuálne nainštalovaný.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s je označený ako automaticky nainštalovaný.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -341,29 +341,24 @@ msgstr ""
"Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark auto“ a "
"„apt-mark manual“."
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Adresár %s sa nedá zamknúť"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Adresár pre sťahovanie sa nedá zamknúť"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
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:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, 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:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -373,7 +368,7 @@ msgstr ""
"adrese:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -385,69 +380,69 @@ msgstr ""
"ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie "
"balíka.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, 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:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Stiahnuť zdroj %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Zlyhalo stiahnutie niektorých archívov."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Sťahovanie ukončené v režime „iba stiahnuť“"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, 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:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Príkaz na zostavenie „%s“ zlyhal.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Proces potomka zlyhal"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
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:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -456,27 +451,27 @@ msgstr ""
"Informácie o architektúre nie sú dostupné pre %s. Informácie o nastavení "
"nájdete v apt.conf(5) APT::Architectures"
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Spracovanie závislostí na zostavenie zlyhalo"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nedajú sa získať závislosti na zostavenie %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žiadne závislosti na zostavenie.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -485,20 +480,20 @@ msgstr ""
"%s závislosť pre %s nemožno splniť, pretože %s nie je povolené na balíkoch "
"„%s“"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislosť pre %s nemožno splniť, pretože sa nedá nájsť balík %s"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, 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:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -507,7 +502,7 @@ msgstr ""
"%s závislosť pre %s nemožno splniť, pretože kandidátska verzia balíka %s, "
"nedokáže splniť požiadavky na verziu"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -515,17 +510,17 @@ msgid ""
msgstr ""
"%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti na zostavenie %s nemožno splniť."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Spracovanie závislostí na zostavenie zlyhalo"
@@ -635,11 +630,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -653,52 +648,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "%s nemožno označiť, pretože nie je nainštalovaný.\n"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s už bol označený ako manuálne nainštalovaný.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s už bol označený ako automaticky nainštalovaný.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr "%s bol už nastavený na podržanie.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr "%s bol už nastavený na nepodržanie.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Čakalo sa na %s, ale nebolo to tam"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr "%s je označený na podržanie.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "Zrušené podržanie %s.\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr "Vykonanie dpkg zlyhalo. Ste root?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -939,7 +935,7 @@ msgstr "Uplynulo spojenie dátového socketu"
msgid "Unable to accept connection"
msgstr "Spojenie sa nedá prijať"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Problém s hašovaním súboru"
@@ -1028,37 +1024,37 @@ msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Nedá sa pripojiť k %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
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:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Bola zistená aspoň jedna nesprávna signatúra."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"Nedá sa spustiť „apt-key“ kvôli overeniu podpisu (je nainštalované gnupg?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Neznáma chyba pri spustení apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Nasledovné signatúry sú neplatné:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1070,31 +1066,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr "Prázdne súbory nemôžu byť platné archívy"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Chyba zápisu do tohto súboru"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Chyba pri čítaní zo servera"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Výber zlyhal"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Uplynul čas spojenia"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupného súboru"
@@ -1102,53 +1098,301 @@ msgstr "Chyba zápisu do výstupného súboru"
msgid "Waiting for headers"
msgstr "Čaká sa na hlavičky"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Chybná hlavička"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP server poslal neplatnú hlavičku odpovede"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP server poslal neplatnú hlavičku Content-Length"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP server poslal neplatnú hlavičku Content-Range"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má poškodenú podporu rozsahov"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Neznámy formát dátumu"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Zlé dátové záhlavie"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Spojenie zlyhalo"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Vnútorná chyba"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Opravujú sa závislosti..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " zlyhalo."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Závislosti sa nedajú opraviť"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Sada na aktualizáciu sa nedá minimalizovať"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Hotovo"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nesplnené závislosti. Skúste použiť -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Nainštalovaný]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Nainštalovaný]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Nainštalovaný]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Nainštalovaný]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "ale nainštalovaný je %s"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ale inštalovať sa bude %s"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "ale sa nedá nainštalovať"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "ale je to virtuálny balík"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "ale nie je nainštalovaný"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "ale sa nebude inštalovať"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " alebo"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Nasledovné balíky majú nesplnené závislosti:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Nasledovné balíky sa ODSTRÁNIA:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Nasledovné balíky sa aktualizujú:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Nasledovné balíky sa DEGRADUJÚ:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Nasledovné pridržané balíky sa zmenia:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (kvôli %s) "
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n"
+"Ak presne neviete, čo robíte, tak to NEROBTE!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu aktualizovaných, %lu nových nainštalovaných, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu reinštalovaných, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu degradovaných, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu na odstránenie a %lu neaktualizovaných.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Chyba pri preklade regulárneho výrazu - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Príkaz update neprijíma žiadne argumenty"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"POZN.: Toto je iba simulácia!\n"
+" apt-get potrebuje na skutočné spustenie práva používateľa root.\n"
+" Tiež pamätajte, že zamykanie je deaktivované, takže\n"
+" sa nespoliehajte na to že to bude platiť v reálnej situácii!"
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!"
@@ -1419,254 +1663,6 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Balík „%s“ nie je nainštalovaný, nedá sa teda odstrániť\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Opravujú sa závislosti..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " zlyhalo."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Závislosti sa nedajú opraviť"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Sada na aktualizáciu sa nedá minimalizovať"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Hotovo"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nesplnené závislosti. Skúste použiť -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Nainštalovaný]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Nainštalovaný]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Nainštalovaný]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Nainštalovaný]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "ale nainštalovaný je %s"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ale inštalovať sa bude %s"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "ale sa nedá nainštalovať"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "ale je to virtuálny balík"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "ale nie je nainštalovaný"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "ale sa nebude inštalovať"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " alebo"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Nasledovné balíky majú nesplnené závislosti:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Nainštalujú sa nasledovné NOVÉ balíky:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Nasledovné balíky sa ODSTRÁNIA:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Nasledovné balíky sa ponechajú v súčasnej verzii:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Nasledovné balíky sa aktualizujú:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Nasledovné balíky sa DEGRADUJÚ:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Nasledovné pridržané balíky sa zmenia:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (kvôli %s) "
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"UPOZORNENIE: Nasledovné dôležité balíky sa odstránia.\n"
-"Ak presne neviete, čo robíte, tak to NEROBTE!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu aktualizovaných, %lu nových nainštalovaných, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu reinštalovaných, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu degradovaných, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu na odstránenie a %lu neaktualizovaných.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Chyba pri preklade regulárneho výrazu - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Príkaz update neprijíma žiadne argumenty"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"POZN.: Toto je iba simulácia!\n"
-" apt-get potrebuje na skutočné spustenie práva používateľa root.\n"
-" Tiež pamätajte, že zamykanie je deaktivované, takže\n"
-" sa nespoliehajte na to že to bude platiť v reálnej situácii!"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1720,20 +1716,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Už existuje "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Už existuje:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Získava sa:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Získava sa:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr ""
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Chyba "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Chyba:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1759,17 +1759,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Nedá sa načítať %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1843,7 +1843,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Zlučujú sa dostupné informácie"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1867,46 +1867,46 @@ msgstr ""
" -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:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Nedá sa vyhodnotiť %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Do %s sa nedá zapisovať"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Nedá sa určiť verzia programu debconf. Je debconf nainštalovaný?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Zoznam rozšírení balíka je príliš dlhý"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Chyba pri spracovávaní adresára %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Zoznam zdrojových rozšírení je príliš dlhý"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Chyba pri zapisovaní hlavičky do súboru"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Chyba pri spracovávaní obsahu %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1986,11 +1986,11 @@ msgstr ""
" -c=? Načíta tento konfiguračný súbor\n"
" -o=? Nastaví ľubovoľnú voľbu"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Nevyhovel žiaden výber"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "V súbore balíka skupiny „%s“ chýbajú niektoré súbory"
@@ -2102,22 +2102,22 @@ msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
msgid "Archive had no package field"
msgstr "Archív neobsahuje pole „package“"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nemá žiadnu položku override\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správcom %s je %s, nie %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nemá žiadnu položku „source override“\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nemá žiadnu položku „binary override“\n"
@@ -2203,7 +2203,7 @@ msgstr "Problém s odlinkovaním %s"
msgid "Failed to rename %s to %s"
msgstr "Premenovanie %s na %s zlyhalo"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2227,11 +2227,11 @@ msgstr ""
" -c=? Načíta tento konfiguračný súbor\n"
" -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Neznámy záznam o balíku!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2303,6 +2303,26 @@ msgstr "Nebolo možné nájsť autentifikačný záznam pre: %s"
msgid "Hash mismatch for: %s"
msgstr "Nezhoda kontrolných haš súčtov: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, 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:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Spôsob %s nebol správne spustený"
+
+#: apt-pkg/acquire-worker.cc:485
+#, 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."
+
#: apt-pkg/cachefile.cc:94
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ť."
@@ -2315,176 +2335,300 @@ msgstr "Na opravu týchto problémov môžete skúsiť spustiť apt-get update"
msgid "The list of sources could not be read."
msgstr "Nedá sa načítať zoznam zdrojov."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Vyrovnávacia pamäť balíkov je prázdna"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
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:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený, je príliš malý"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Tento APT nepodporuje systém na správu verzií „%s“"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Súbor vyrovnávacej pamäti balíkov bol vytvorený pre inú architektúru"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Závisí na"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Predzávisí na"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Navrhuje"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Odporúča"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Koliduje s"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Nahrádza"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Zneplatňuje"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Kazí"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Rozširuje"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "dôležitý"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "požadovaný"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "štandardný"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "voliteľný"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "extra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Prepočítava sa aktualizácia"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Nedá sa nájsť ovládač spôsobu %s."
+msgid "Index file type '%s' is not supported"
+msgstr "Indexový súbor typu „%s“ nie je podporovaný"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Spôsob %s nebol správne spustený"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Skomolený riadok %lu v zozname zdrojov %s (nie je možné spracovať [option])"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, 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."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s ([option] je príliš krátke)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nie je priradenie)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nemá kľúč)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] kľúč %s nemá hodnotu)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, 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:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (absolútny dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, 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:335
+#, c-format
+msgid "Opening %s"
+msgstr "Otvára sa %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, 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:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
+
+#: apt-pkg/sourcelist.cc:375
+#, 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"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "Indexový súbor typu „%s“ nie je podporovaný"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Vytvára sa strom závislostí"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nie je možné vykonať stat %s."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandidátske verzie"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Generovanie závislostí"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Načítavajú sa stavové informácie"
+#: apt-pkg/pkgcachegen.cc:273
+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/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:276
+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:279
+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:282
+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:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nie je možné otvoriť StateFile %s"
+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/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nie je možné zapísať dočasný StateFile %s"
+msgid "Couldn't stat source package list %s"
+msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Načítavajú sa zoznamy balíkov"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Collecting File poskytuje"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Poslať scénár riešiteľovi"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Poslať požiadavku riešiteľovi"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Pripraviť sa na prijatie riešenia"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "Spustiť externého riešiteľa"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "premenovanie zlyhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Nezhoda kontrolných haš súčtov"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Veľkosti sa nezhodujú"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Neplatná operácia %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Chyba pri zápise"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
#, fuzzy
msgid "Does not start with a cleartext signature"
msgstr "Súbor %s nezačína podpísanou správou v čistom texte (clearsigned)"
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2494,7 +2638,7 @@ msgstr ""
"použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "Chyba GPG: %s: %s"
@@ -2510,14 +2654,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2526,16 +2670,16 @@ msgstr ""
"Nepodarilo sa nájsť očakávanú položku „%s“ v súbore Release (Nesprávna "
"položka sources.list alebo chybný formát súboru)"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Nepodarilo sa nájsť haš „%s“ v súbore Release"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
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:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2544,19 +2688,19 @@ msgstr ""
"Súbor Release pre %s vypršal (neplatný od %s). Aktualizácie tohto zdroja "
"softvéru sa nepoužijú."
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2565,125 +2709,53 @@ 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:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Nie je možné nájsť zdroj na stiahnutie verzie „%s“ balíka „%s“"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, 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/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Vyskytla sa chyba pri spracovávaní %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:273
-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:276
-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:279
-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:282
-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:591
-#, 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:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Načítavajú sa zoznamy balíkov"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Collecting File poskytuje"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Blok výrobcu %s neobsahuje otlačok (fingerprint)"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Adresár zoznamov %spartial chýba."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Archívny adresár %spartial chýba."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Indexový súbor typu „%s“ nie je podporovaný"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "Adresár %s sa nedá zamknúť"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, 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:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Sťahuje sa %li. súbor z %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-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/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Do sources.list musíte zadať nejaký „source“ (zdrojový) URI"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nie je možné vykonať stat %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2707,7 +2779,7 @@ msgstr "Nezrozumiteľné pridržanie typu %s"
msgid "No priority (or zero) specified for pin"
msgstr "Nebola zadaná žiadna (alebo nulová) priorita na pridržanie"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2716,12 +2788,12 @@ msgstr ""
"Nebolo možné vykonať okamžitú konfiguráciu „%s“. Pozri prosím podrobnosti v "
"man 5 apt.conf pod APT::Immediate-Configure (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr "Nedá sa nakonfigurovať „%s“."
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2732,10 +2804,13 @@ 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/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+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/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2806,11 +2881,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Kopírujú sa zoznamy balíkov..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Zapisuje sa nový zoznam zdrojov\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Položky zoznamu zdrojov pre tento disk sú:\n"
@@ -2820,7 +2895,7 @@ 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 nedá sa nájsť jeho archív."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2828,140 +2903,40 @@ msgstr ""
"Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené "
"pridržanými balíkmi."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
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/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "Poslať scénár riešiteľovi"
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr "Poslať požiadavku riešiteľovi"
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr "Pripraviť sa na prijatie riešenia"
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr "Externý riešiteľ zlyhal bez uvedenia chybovej správy"
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr "Spustiť externého riešiteľa"
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Súbor %s sa nedá spracovať (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Súbor %s sa nedá spracovať (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nedá spracovať súbor Release %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Žiadne sekcie v Release súbore %s"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Chýba položka „Hash“ v súbore Release %s"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Chýba položka „Valid-Until“ v súbore Release %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Chýba položka „Date“ v súbore Release %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Skomolený riadok %lu v zozname zdrojov %s (nie je možné spracovať [option])"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s ([option] je príliš krátke)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nie je priradenie)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nemá kľúč)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] kľúč %s nemá hodnotu)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Vytvára sa strom závislostí"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandidátske verzie"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s (absolútny dist)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Generovanie závislostí"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Načítavajú sa stavové informácie"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "Otvára sa %s"
+msgid "Failed to open StateFile %s"
+msgstr "Nie je možné otvoriť StateFile %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie je možné zapísať dočasný StateFile %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, 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"
-
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Súbor %s sa nedá spracovať (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2973,47 +2948,47 @@ msgstr "Nebolo nájdené vydanie „%s“ pre „%s“"
msgid "Version '%s' for '%s' was not found"
msgstr "Nebola nájdená verzia „%s“ pre „%s“"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Nebolo možné nájsť úlohu „%s“"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Nie je možné vybrať verzie z balíka „%s“, pretože je čisto virtuálny"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Nie je možné vybrať najnovšiu verziu z balíka „%s“, pretože je čisto "
"virtuálny"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Nie je možné vybrať kandidátsku verziu z balíka „%s“, pretože nemá kandidáta"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Nie je možné vybrať nainštalovanú verziu z balíka „%s“, pretože nie je "
"nainštalovaný"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3022,176 +2997,59 @@ msgstr ""
"Nie je možné vybrať nainštalované ani kandidátske verzie z balíka „%s“, "
"pretože nemá žiadnu z nich"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Inštaluje sa %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Nastavuje sa %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Odstraňuje sa %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "Úplne sa odstraňuje %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Zaznamenali sme zmiznutie %s"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Vykonáva sa spúšťač post-installation %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Adresár „%s“ chýba"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Nedá sa otvoriť súbor „%s“"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Pripravuje sa %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Unpacking %s"
-msgstr "Rozbaľuje sa %s"
+msgid "Unable to parse Release file %s"
+msgstr "Nedá spracovať súbor Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Preparing to configure %s"
-msgstr "Pripravuje sa nastavenie %s"
+msgid "No sections in Release file %s"
+msgstr "Žiadne sekcie v Release súbore %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Installed %s"
-msgstr "Nainštalovaný balík %s"
+msgid "No Hash entry in Release file %s"
+msgstr "Chýba položka „Hash“ v súbore Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Pripravuje sa odstránenie %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Chýba položka „Valid-Until“ v súbore Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Removed %s"
-msgstr "Odstránený balík %s"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Chýba položka „Date“ v súbore Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Pripravuje sa úplné odstránenie %s"
+msgid "%lid %lih %limin %lis"
+msgstr "%li d %li h %li min %li s"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Completely removed %s"
-msgstr "Balík „%s“ je úplne odstránený"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Do %s sa nedá zapisovať"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr "Operácia bola prerušená predtým, než sa stihla dokončiť"
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr "Nezapíše sa správa apport, pretože už bol dosiahnutý limit MaxReports"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "problém so závislosťami - ponecháva sa nenakonfigurované"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Nezapíše sa správa apport, pretože chybová správa indikuje, že je to chyba v "
-"nadväznosti na predošlé zlyhanie."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
-"zaplnený"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku "
-"pamäte"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
-"zaplnený"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Nezapíše sa správa apport, pretože chybová správa indikuje V/V chybu dpkg"
+msgid "%lih %limin %lis"
+msgstr "%li h %li min %li s"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr "Nedá sa zamknúť adresár na správu (%s), používa ho iný proces?"
+msgid "%limin %lis"
+msgstr "%li min %li s"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Nedá sa zamknúť adresár na správu (%s), ste root?"
+msgid "%lis"
+msgstr "%li s"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s“. "
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Nie je zamknuté"
+msgid "Selection %s not found"
+msgstr "Voľba %s nenájdená"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3327,35 +3185,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Hotovo"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li d %li h %li min %li s"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li h %li min %li s"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%li min %li s"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%li s"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Voľba %s nenájdená"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Nedá sa vykonať mmap prázdneho súboru"
@@ -3420,109 +3249,275 @@ msgstr "Prípojný bod %s sa nedá vyhodnotiť"
msgid "Failed to stat the cdrom"
msgstr "Nedá sa vykonať stat() CD-ROM"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Nerozpoznaná skratka typu: „%c“"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Otvára sa konfiguračný súbor %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, 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:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaktická chyba %s:%u: Skomolená značka"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, 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:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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:881
+#: apt-pkg/contrib/configuration.cc:887
#, 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:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva „%s“"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Syntaktická chyba %s:%u: direktíva clear vyžaduje ako argument strom volieb"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, 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/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Parameter príkazového riadka „%c“ [z %s] je neznámy"
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Nezrozumiteľný parameter %s na príkazovom riadku"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, 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:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Voľba %s vyžaduje argument."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Parameter %s: Zadanie konfiguračnej položky musí obsahovať =<hodn>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "Voľba %s vyžaduje ako argument celé číslo (integer), nie „%s“"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Voľba „%s“ je príliš dlhá"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, 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:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Neplatná operácia %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Inštaluje sa %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Nastavuje sa %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Odstraňuje sa %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "Úplne sa odstraňuje %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Zaznamenali sme zmiznutie %s"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Vykonáva sa spúšťač post-installation %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Adresár „%s“ chýba"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Nedá sa otvoriť súbor „%s“"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Pripravuje sa %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Rozbaľuje sa %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Pripravuje sa nastavenie %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "Nainštalovaný balík %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Pripravuje sa odstránenie %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "Odstránený balík %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Pripravuje sa úplné odstránenie %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "Balík „%s“ je úplne odstránený"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Do %s sa nedá zapisovať"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "Operácia bola prerušená predtým, než sa stihla dokončiť"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr "Nezapíše sa správa apport, pretože už bol dosiahnutý limit MaxReports"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "problém so závislosťami - ponecháva sa nenakonfigurované"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Nezapíše sa správa apport, pretože chybová správa indikuje, že je to chyba v "
+"nadväznosti na predošlé zlyhanie."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
+"zaplnený"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku "
+"pamäte"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
+"zaplnený"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Nezapíše sa správa apport, pretože chybová správa indikuje V/V chybu dpkg"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr "Nedá sa zamknúť adresár na správu (%s), používa ho iný proces?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nedá sa zamknúť adresár na správu (%s), ste root?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s“. "
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Nie je zamknuté"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "Pokus o uvoľnenie uzla (DropNode) na stále prepojenom uzle"
@@ -3627,7 +3622,7 @@ msgstr "Toto nie je platný DEB archív, chýba časť „%s“"
msgid "Internal error, could not locate member %s"
msgstr "Vnútorná chyba, nedá sa nájsť časť %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Nespracovateľný riadiaci súbor"
@@ -3656,23 +3651,23 @@ msgstr "Archív je príliš krátky"
msgid "Failed to read the archive headers"
msgstr "Chyba pri čítaní hlavičiek archívu"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Vytvorenie rúry zlyhalo"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Spustenie gzip zlyhalo "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Porušený archív"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Neznáma TAR hlavička typu %u, člen %s"
diff --git a/po/sl.po b/po/sl.po
index 85e060046..845fe3c5f 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2012-06-27 21:29+0000\n"
"Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
"Language-Team: Slovenian <sl@li.org>\n"
@@ -25,144 +25,144 @@ msgstr ""
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:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Vseh imen paketov: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Skupno struktur paketov : "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Običajni paketi: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Čisti navidezni paketi: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Posamezni navidezni paketi: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Mešani navidezni paketi: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Manjka: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Vseh različic: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Skupno različnih opisov: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Vseh odvisnosti: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Vseh povezav Raz/Dat: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Skupno razmerij opisov/datotek: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Vseh dobljenih preslikav: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Vseh razširjenih nizov: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Celotna ohlapna velikost: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Celotna velikost, izračunana za: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Datoteka paketa %s ni usklajena."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Noben paket ni bil najden"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Podati morate vsaj en iskalni vzorec"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark showauto'."
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Ni mogoče najti paketa %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Datoteke paketa:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "Predpomnilnik ni usklajen, x-ref datoteke paketa ni mogoč"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Pripeti paketi:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(ni najdeno)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Nameščen: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Kandidat: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(brez)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Bucika paketa: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Preglednica različic:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s za %s kodno preveden na %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -233,20 +233,20 @@ msgstr ""
"Za več podrobnosti si oglejte strani priročnikov apt-cache(8) in apt."
"conf(5).\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Navedite ime tega diska, kot je naprimer 'Debian 5.0.3 disk 1'"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Vstavite disk v pogon in pritisnite vnosno tipko"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Priklapljanje '%s' na '%s' je spodletelo"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -254,7 +254,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Ponovi to opravilo za preostanek CD-jev v vaši zbirki."
@@ -290,48 +290,48 @@ msgstr ""
" -c=? Prebere podano datoteko z nastavitvami\n"
" -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Izbiranje '%s' kot vir paketa namesto '%s'\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Prezri nerazpoložljivo različico '%s' paketa '%s'"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Ni mogoče najti paketa %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s je bil nastavljen na ročno nameščen.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s je nastavljen na samodejno nameščen.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -339,30 +339,25 @@ msgstr ""
"Ta ukaz je zastarel. Namesto njega uporabite 'apt-mark auto' in 'apt-mark "
"manual'."
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Notranja napaka, reševalnik težav je pokvaril stvari"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Mape %s ni mogoče zakleniti"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Ni mogoče zakleniti mape prejemov"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Izvornega paketa za %s ni mogoče najti"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -371,7 +366,7 @@ msgstr ""
"OPOMBA: pakiranje '%s' vzdrževano v sistemu nadzora različice '%s' na:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -382,69 +377,69 @@ msgstr ""
"bzr branch %s\n"
"za pridobitev zadnjih (morda še neizdanih) posodobitev paketa.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Preskok že prejete datoteke '%s'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Dobi vir %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Nekaterih arhivov ni mogoče pridobiti."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Prejem je dokončan in uporabljen je način samo prejema"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Odpakiranje že odpakiranih izvornih paketov v %s je bilo preskočeno\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Ukaz gradnje '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Podrejeno opravilo ni uspelo"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
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:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -453,27 +448,27 @@ msgstr ""
"Za %s ni bilo mogoče najti podatkov o arhitekturi. Za nastavitev si oglejte "
"apt.conf(5) APT::Architectures"
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Obdelava odvisnosti za gradnjo je spodletela"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni mogoče dobiti podrobnosti o odvisnostih za gradnjo za %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nima odvisnosti za gradnjo.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -481,20 +476,20 @@ msgid ""
msgstr ""
"odvisnosti %s za %s ni mogoče zadovoljiti, ker %s ni dovoljen na paketih '%s'"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, 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:1329
+#: cmdline/apt-get.cc:1320
#, 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:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -503,7 +498,7 @@ msgstr ""
"odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa "
"%s ne more zadostiti zahtev različice"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -512,17 +507,17 @@ msgstr ""
"odvisnosti %s za %s ni mogoče zadovoljiti, ker je različica kandidata paketa "
"%s nima različice kandidata"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, 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:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Odvisnosti za gradnjo %s ni bilo mogoče zadostiti."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Obdelava odvisnosti za gradnjo je spodletela"
@@ -632,11 +627,11 @@ msgid "Must specify at least one pair url/filename"
msgstr ""
"Potrebno je navesti vsaj en paket, za katerega želite dobiti izvorno kodo"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -650,52 +645,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "paket %s ne more biti označen, ker ni nameščen.\n"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr "paket %s je bil že nastavljen na ročno nameščen.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "paket %s je bil že nastavljen kot samodejno nameščen.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr "paket %s je bil že nastavljen kot na čakanju.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr "paket %s je bil že nastavljen kot ne na čakanju.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Program je čakal na %s a ga ni bilo tam"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr "paket %s je nastavljen kot na čakanju.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "Čakanje za %s je bilo preklicano.\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr "Izvajanje dpkg je spodletelo. Ali ste skrbnik?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -935,7 +931,7 @@ msgstr "Povezava podatkovne vtičnice je zakasnela"
msgid "Unable to accept connection"
msgstr "Ni mogoče sprejeti povezave"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Težava med razprševanjem datoteke"
@@ -1024,38 +1020,38 @@ msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Ni se mogoče povezati z %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Notranja napaka: Dober podpis, toda ni mogoče določiti podpisa ključa?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Najden je bil vsaj en neveljaven podpis."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"Ni mogoče izvesti 'apt-key' za preverjanje podpisa (je gnupg nameščen?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Neznana napaka med izvajanjem apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Naslednji podpisi so bili neveljavni:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1066,31 +1062,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr "Prazne datoteke ne morejo biti veljavni arhivi"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Napaka med pisanjem v datoteko"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Napaka med branjem s strežnika. Oddaljeni del je zaprl povezavo"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Napaka med branjem s strežnika"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Napaka med pisanjem v datoteko"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Izbira ni uspela"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Povezava je zakasnela"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Napaka med pisanjem v izhodno datoteko"
@@ -1098,53 +1094,304 @@ msgstr "Napaka med pisanjem v izhodno datoteko"
msgid "Waiting for headers"
msgstr "Čakanje na glave"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Neveljavna vrstica glave"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "Strežnik HTTP je poslal neveljavno glavo odgovora"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Strežnik HTTP je poslal glavo z neveljavno dolžino vsebine"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Strežnik HTTP je poslal glavo z neveljavnim obsegom vsebine"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Ta strežnik HTTP ima pokvarjen obseg podpore"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Neznana oblika datuma"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Napačni podatki glave"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Povezava ni uspela"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Notranja napaka"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Popravljanje odvisnosti ..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " spodletelo."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Ni mogoče popraviti odvisnosti"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Opravljeno"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Če želite popraviti napake, poskusite pognati 'apt-get -f install'."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Nerešene odvisnosti. Poskusite uporabiti -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Nameščeno]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Nameščeno]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Nameščeno]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Nameščeno]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "vendar je paket %s nameščen"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "vendar bo paket %s nameščen"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "vendar se ga ne da namestiti"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "vendar je navidezen paket"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "vendar ni nameščen"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "vendar ne bo nameščen"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " ali"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Naslednji paketi imajo nerešene odvisnosti:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Naslednji NOVI paketi bodo nameščeni:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Naslednji paketi so bili zadržani:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Naslednji paketi bodo nadgrajeni:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Naslednji paketi bodo POSTARANI:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Naslednji zadržani paketi bodo spremenjeni:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (zaradi %s) "
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n"
+"Tega NE storite, razen če ne veste natanko kaj počenjate!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu nadgrajenih, %lu na novo nameščenih, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu posodobljenih, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu postaranih, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Napaka med prevajanjem logičnega izraza - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Ukaz update ne sprejema argumentov"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"OPOMBA: To je samo simulacija!\n"
+" apt-get za pravo izvajanje potrebuje privilegije skrbnika.\n"
+" Zaklepanje je onemogočeno, zato se ne zanašajte\n"
+" na pomembnost trenutnega pravega stanja!"
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Notranja napaka, NamestiPakete je bil klican z pokvarjenimi paketi!"
@@ -1417,257 +1664,6 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Paket '%s' ni nameščen, zato ni bil odstranjen\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Popravljanje odvisnosti ..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " spodletelo."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Ni mogoče popraviti odvisnosti"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni mogoče pomanjšati zbirke za nadgradnjo"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Opravljeno"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Če želite popraviti napake, poskusite pognati 'apt-get -f install'."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Nerešene odvisnosti. Poskusite uporabiti -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Nameščeno]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Nameščeno]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Nameščeno]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Nameščeno]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "vendar je paket %s nameščen"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "vendar bo paket %s nameščen"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "vendar se ga ne da namestiti"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "vendar je navidezen paket"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "vendar ni nameščen"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "vendar ne bo nameščen"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " ali"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Naslednji paketi imajo nerešene odvisnosti:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Naslednji NOVI paketi bodo nameščeni:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Naslednji paketi so bili zadržani:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Naslednji paketi bodo nadgrajeni:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Naslednji paketi bodo POSTARANI:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Naslednji zadržani paketi bodo spremenjeni:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (zaradi %s) "
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"OPOZORILO: Naslednji nujni paketi bodo odstranjeni.\n"
-"Tega NE storite, razen če ne veste natanko kaj počenjate!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu nadgrajenih, %lu na novo nameščenih, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu posodobljenih, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu postaranih, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu bo odstranjenih in %lu ne nadgrajenih.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ne popolnoma nameščenih ali odstranjenih.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Napaka med prevajanjem logičnega izraza - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Ukaz update ne sprejema argumentov"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"OPOMBA: To je samo simulacija!\n"
-" apt-get za pravo izvajanje potrebuje privilegije skrbnika.\n"
-" Zaklepanje je onemogočeno, zato se ne zanašajte\n"
-" na pomembnost trenutnega pravega stanja!"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1721,20 +1717,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Zadetek "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Zadetek:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Dobi:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Dobi:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Prezr "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Prezr:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Nap "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Nap:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1760,17 +1760,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Ni mogoče brati %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1845,7 +1845,7 @@ msgstr "nad tem sporočilom. Popravite jih in poženite Namest[I]tev še enkrat"
msgid "Merging available information"
msgstr "Združevanje razpoložljivih podaktov"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1869,46 +1869,46 @@ msgstr ""
" -c=? Prebere podano datoteko z nastavitvami\n"
" -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Ni mogoče določiti %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Ni mogoče pisati na %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ni mogoče ugotoviti različice debconfa. Je sploh nameščen?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Seznam razširitev paketov je predolg"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Napaka med obdelavo mape %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Seznam razširitev virov je predolg"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Napaka med pisanjem glave v datoteko vsebine"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Napaka med obdelavo vsebine %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1988,11 +1988,11 @@ msgstr ""
" -c=? prebere to nastavitveno datoteko\n"
" -o=? nastavi poljubno možnost nastavitve"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Nobena izbira se ne ujema"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Nekatere datoteke manjkajo v skupini datotek paketov `%s'"
@@ -2104,22 +2104,22 @@ msgstr " Dosežena meja RazVezovanja %sB.\n"
msgid "Archive had no package field"
msgstr "Arhiv ni imel polja s paketom"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nima prepisanega vnosa\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Vzdrževalec %s je %s in ne %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nima izvornega vnosa prepisa\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nima tudi binarnega vnosa prepisa\n"
@@ -2205,7 +2205,7 @@ msgstr "Napaka med odvezovanjem %s"
msgid "Failed to rename %s to %s"
msgstr "Ni mogoče preimenovati %s v %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2230,11 +2230,11 @@ msgstr ""
" -c=? Prebere to nastavitveno datoteko\n"
" -o=? Nastavi poljubno nastavitveno možnost, na primer dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Neznan zapis paketa!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2309,6 +2309,26 @@ msgstr "Ni mogoče najti zapisa overitve za: %s"
msgid "Hash mismatch for: %s"
msgstr "Neujemanje razpršila za: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Gonilnika načinov %s ni mogoče najti."
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Način %s se ni začel pravilno"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Vstavite disk z oznako '%s' v pogon '%s' in pritisnite vnosno tipko."
+
#: apt-pkg/cachefile.cc:94
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."
@@ -2321,176 +2341,303 @@ msgstr "Za odpravljanje težav poskusite zagnati apt-get update."
msgid "The list of sources could not be read."
msgstr "Seznama virov ni mogoče brati."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Prazen predpomnilnik paketov"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Datoteka s predpomnilnikom paketov je pokvarjena"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Različica datoteke s predpomnilnikom paketov ni združljiva"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr "Datoteka predpomnilnika paketa je okvarjena. Je premajhna"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, 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:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Predpomnilnik paketov je bil izgrajen za drugačno arhitekturo"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Odvisen od"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Predodvisen od"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Priporoča"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Priporoča"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "V sporu z"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Zamenja"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Zastara"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Pokvari"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Izboljša"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "pomembno"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "obvezno"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "običajni"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "izbirno"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "dodatno"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Preračunavanje nadgradnje"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Gonilnika načinov %s ni mogoče najti."
+msgid "Index file type '%s' is not supported"
+msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Izberite, če je paket 'dpkg-dev' nameščen.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Način %s se ni začel pravilno"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Slabo oblikovana vrstica %lu na seznamu virov %s ([možnosti] ni mogoče "
+"razčleniti)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Vstavite disk z oznako '%s' v pogon '%s' in pritisnite vnosno tipko."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnost] prekratka)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Slabo oblikovana vrstica %lu na seznamu vrstic %s ([%s] ni dodelitev)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] nima ključa)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] ključ %s nima "
+"vrednosti)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (distribucija)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+"Slabo oblikovana vrstica %lu v seznamu virov %s (absolutna distribucija)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+"Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev distribucije)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Odpiranje %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Vrstica %u v seznamu virov %s je predolga."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Gradnja drevesa odvisnosti"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ni mogoče določiti %s."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Različice kandidatov"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Predpomnilnik ima neustrezen sistem različic"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Ustvarjanje odvisnosti"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Med obdelovanjem %s je prišlo do napake (%s%d)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Branje podatkov o stanju"
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Čestitamo, presegli ste število imen paketov, ki jih zmore APT."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Čestitamo, presegli ste število različic, ki jih zmore APT."
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Čestitamo, presegli ste število opisov, ki jih je zmožen APT."
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Čestitamo, presegli ste število odvisnosti, ki jih zmore APT."
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Odpiranje DatotekeStanja %s je spodletelo"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Paketa %s %s ni bilo mogoče najti med obdelavo odvisnosti datotek"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Pisanje začasne DatotekeStanja %s je spodletelo"
+msgid "Couldn't stat source package list %s"
+msgstr "Ni mogoče določiti seznama izvornih paketov %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Branje seznama paketov"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Zbiranje dobaviteljev datotek"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Napaka VI med shranjevanjem predpomnilnika virov"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Pošlji scenarij reševalniku"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Pošlji zahtevo reševalniku"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Priprava za rešitev prejemanja"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "Izvedi zunanji reševalnik"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "preimenovanje je spodletelo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Neujemanje vsote razpršil"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Neujemanje velikosti"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Neveljavno opravilo %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Napaka pisanja"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
#, fuzzy
msgid "Does not start with a cleartext signature"
msgstr "Datoteka %s se ne začne s čisto podpisanim sporočilom"
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2500,7 +2647,7 @@ msgstr ""
"zato bodo uporabljene predhodne datoteke kazal. Napaka GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "Napaka GPG: %s: %s"
@@ -2516,14 +2663,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2532,16 +2679,16 @@ msgstr ""
"Ni mogoče najti pričakovanega vnosa '%s' v datoteki Release (napačen vnos "
"sources.list ali slabo oblikovana datoteka)"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ni mogoče najti vsote razprševanja za '%s' v datoteki Release"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "Za naslednje ID-je ključa ni na voljo javnih ključev:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2550,19 +2697,19 @@ msgstr ""
"Datoteka Release za %s je potekla (neveljavna od %s). Posodobitev za to "
"skladišče ne bo uveljavljena."
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2571,12 +2718,12 @@ 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:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Ni mogoče najti vira za prejem različice '%s' paketa '%s'"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2584,112 +2731,42 @@ msgstr ""
"Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje za paket "
"%s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Predpomnilnik ima neustrezen sistem različic"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Med obdelovanjem %s je prišlo do napake (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Čestitamo, presegli ste število imen paketov, ki jih zmore APT."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Čestitamo, presegli ste število različic, ki jih zmore APT."
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Čestitamo, presegli ste število opisov, ki jih je zmožen APT."
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Čestitamo, presegli ste število odvisnosti, ki jih zmore APT."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, 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 datotek"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Ni mogoče določiti seznama izvornih paketov %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Branje seznama paketov"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Zbiranje dobaviteljev datotek"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Napaka VI med shranjevanjem predpomnilnika virov"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Ponudnikov blok %s ne vsebuje prstnega podpisa"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Mapa seznama %spartial manjka."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Mapa arhivov %spartial manjka."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Vrsta datoteke s kazalom '%s' ni podprta"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "Mape %s ni mogoče zakleniti"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Pridobivanje datoteke %li od %li (%s preostalo)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Pridobivanje datoteke %li od %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Prejem nekaterih datotek kazala je spodletel. Bile so prezrte ali pa so bile "
-"namesto njih uporabljene stare."
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "V sources.list morate vstaviti URI-je z viri"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ni mogoče določiti %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2713,7 +2790,7 @@ msgstr "Ni mogoče razumeti vrste bucike %s"
msgid "No priority (or zero) specified for pin"
msgstr "Prednost bucike ni navedena ali pa je nič."
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2722,12 +2799,12 @@ msgstr ""
"Ni mogoče izvesti takojąnje nastavitve na '%s'. Oglejte si man5 apt.conf pod "
"APT::Immediate-Configure za podrobnosti. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr "Ni mogoče nastaviti '%s' "
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2738,10 +2815,13 @@ msgstr ""
"zanke spora/predodvisnosti. To je ponavadi slabo, toda če zares želite "
"nadaljevati, vključite možnost APT::Force-LoopBreak."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Vrstica %u v seznamu virov %s je predolga."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Prejem nekaterih datotek kazala je spodletel. Bile so prezrte ali pa so bile "
+"namesto njih uporabljene stare."
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2812,11 +2892,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Kopiranje seznama paketov ..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Pisanje novega seznama virov\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Izvorni vnosi za ta disk so:\n"
@@ -2826,7 +2906,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "Paket %s mora biti znova nameščen, vendar ni mogoče najti arhiva zanj."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2834,145 +2914,40 @@ msgstr ""
"Napaka. pkgProblemResolver::Resolve pri razrešitvi, ki so jih morda "
"povzročili zadržani paketi."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "Ni mogoče popraviti težav. Imate pokvarjene pakete."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "Pošlji scenarij reševalniku"
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr "Pošlji zahtevo reševalniku"
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr "Priprava za rešitev prejemanja"
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr "Zunanji reševalnik je spodletel brez pravega sporočila o napakah"
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr "Izvedi zunanji reševalnik"
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Ni mogoče razčleniti datoteke paketa %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Ni mogoče razčleniti datoteke paketa %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ni mogoče razčleniti Release datoteke %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Ni izbir v Release datoteki %s"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ni vnosa razpršila v Release datoteki %s"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Neveljavne vnos 'Datum' v Release datoteki %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Slabo oblikovana vrstica %lu na seznamu virov %s ([možnosti] ni mogoče "
-"razčleniti)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([možnost] prekratka)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Slabo oblikovana vrstica %lu na seznamu vrstic %s ([%s] ni dodelitev)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] nima ključa)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Slabo oblikovana vrstica %lu na seznamu virov %s ([%s] ključ %s nima "
-"vrednosti)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (distribucija)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Gradnja drevesa odvisnosti"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev URI)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Različice kandidatov"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-"Slabo oblikovana vrstica %lu v seznamu virov %s (absolutna distribucija)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Ustvarjanje odvisnosti"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Slabo oblikovana vrstica %lu v seznamu virov %s (razčlenitev distribucije)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Branje podatkov o stanju"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "Odpiranje %s"
+msgid "Failed to open StateFile %s"
+msgstr "Odpiranje DatotekeStanja %s je spodletelo"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Pisanje začasne DatotekeStanja %s je spodletelo"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
-
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Vrsta '%s' v vrstici %u na seznamu virov %s ni znana"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Ni mogoče razčleniti datoteke paketa %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2984,44 +2959,44 @@ msgstr "Izdaje '%s' za '%s' ni mogoče najti"
msgid "Version '%s' for '%s' was not found"
msgstr "Različice '%s' za '%s' ni mogoče najti"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Ni mogoče najti naloge '%s'"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Z logičnim izrazom '%s' ni mogoče najti nobenega paketa"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Ni mogoče izbrati različic in paketa '%s', saj je popolnoma navidezen"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Ni mogoče izbrati najnovejše različice iz paketa '%s', saj je popolnoma "
"navidezen"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "Ni mogoče izbrati različice kandidata iz paketa %s, ker nima kandidata"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "Ni mogoče izbrati nameščene različice iz paketa %s, saj ni nameščen"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3030,178 +3005,59 @@ msgstr ""
"Ni mogoče izbrati nameščene različice ali različice kandidata iz paketa "
"'%s', saj nima nobenega od njiju"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Nameščanje %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Nastavljanje %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Odstranjevanje %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "%s je bil popolnoma odstranjen"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "%s je izginil"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Poganjanje sprožilca po namestitvi %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Mapa '%s' manjka"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Ni mogoče odpreti datoteke '%s'"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Pripravljanje %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Unpacking %s"
-msgstr "Razširjanje %s"
+msgid "Unable to parse Release file %s"
+msgstr "Ni mogoče razčleniti Release datoteke %s"
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Preparing to configure %s"
-msgstr "Pripravljanje na nastavljanje %s"
+msgid "No sections in Release file %s"
+msgstr "Ni izbir v Release datoteki %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Installed %s"
-msgstr "%s je bil nameščen"
+msgid "No Hash entry in Release file %s"
+msgstr "Ni vnosa razpršila v Release datoteki %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Pripravljanje na odstranitev %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Neveljaven vnos 'Veljavno-do' v Release datoteki %s"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Removed %s"
-msgstr "%s je bil odstranjen"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Neveljavne vnos 'Datum' v Release datoteki %s"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Pripravljanje na popolno odstranitev %s"
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Completely removed %s"
-msgstr "%s je bil popolnoma odstranjen"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Ni mogoče pisati na %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo"
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-"Poročilo apport ni bilo napisano, ker je bilo število MaxReports že doseženo"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "težave odvisnosti - puščanje nenastavljenega"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na "
-"navezujočo napako iz predhodne napake."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
-"polnega diska"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
-"zaradi pomanjkanja pomnilnika"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na težavo "
-"na krajevnem sistemu"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
-"dpkg V/I"
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Skrbniške mape (%s) ni mogoče zakleniti. Jo morda uporablja drugo opravilo?"
+msgid "%limin %lis"
+msgstr "%limin %lis"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Skrbniške mape (%s) ni mogoče zakleniti. Ali ste skrbnik?"
+msgid "%lis"
+msgstr "%lis"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. "
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Ni zaklenjeno"
+msgid "Selection %s not found"
+msgstr "Izbire %s ni mogoče najti"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3337,35 +3193,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s ... Narejeno"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Izbire %s ni mogoče najti"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "mmap prazne datoteke ni mogoč"
@@ -3429,109 +3256,277 @@ msgstr "Ni mogoče določiti priklopne točke %s"
msgid "Failed to stat the cdrom"
msgstr "Ni mogoče določiti CD-ROM-a"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Neprepoznana vrsta okrajšave: '%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Odpiranje nastavitvene datoteke %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, 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:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Skladenjska napaka %s:%u: Slabo oblikovana oznaka."
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Skladenjska napaka %s:%u: Dodatna krama za vrednostjo."
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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 vrhnji ravni."
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Skladenjska napaka %s:%u: Preveč vgnezdenih vključitev"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Skladenjska napaka %s:%u: Vključeno od tu"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Skladenjska napaka %s:%u: počisti ukaz zahteva drevo možnosti kot argument"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Skladenjska napaka %s:%u: Dodatna krama na koncu datoteke"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, 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:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Možnosti ukazne vrstice %s ni mogoče razumeti"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Možnost ukazne vrstice %s ni boolova vrednost"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Možnost %s zahteva argument."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Možnost %s: Določilo predmeta nastavitve zahtevajo =<val>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, 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:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Možnost '%s' je predolga"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, 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:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Neveljavno opravilo %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Nameščanje %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Nastavljanje %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Odstranjevanje %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "%s je bil popolnoma odstranjen"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "%s je izginil"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Poganjanje sprožilca po namestitvi %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Mapa '%s' manjka"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Ni mogoče odpreti datoteke '%s'"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Pripravljanje %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Razširjanje %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Pripravljanje na nastavljanje %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "%s je bil nameščen"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Pripravljanje na odstranitev %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "%s je bil odstranjen"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Pripravljanje na popolno odstranitev %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s je bil popolnoma odstranjen"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Ni mogoče pisati na %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "Opravilo je bilo prekinjeno preden se je lahko končalo"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+"Poročilo apport ni bilo napisano, ker je bilo število MaxReports že doseženo"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "težave odvisnosti - puščanje nenastavljenega"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na "
+"navezujočo napako iz predhodne napake."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
+"polnega diska"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
+"zaradi pomanjkanja pomnilnika"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Poročilo apport je bilo napisano, ker sporočilo o napaki nakazuje na težavo "
+"na krajevnem sistemu"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Poročilo apport ni bilo napisano, ker sporočilo o napaki nakazuje na napako "
+"dpkg V/I"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Skrbniške mape (%s) ni mogoče zakleniti. Jo morda uporablja drugo opravilo?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Skrbniške mape (%s) ni mogoče zakleniti. Ali ste skrbnik?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. "
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Ni zaklenjeno"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "DropNode je poklical stabilno povezano vozlišče"
@@ -3636,7 +3631,7 @@ msgstr "To ni veljaven arhiv DEB. Manjka član '%s'."
msgid "Internal error, could not locate member %s"
msgstr "Notranja napaka. Ni mogoče najti člana %s."
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Nadzorne datoteke ni mogoče razčleniti"
@@ -3665,23 +3660,23 @@ msgstr "Arhiv je prekratek"
msgid "Failed to read the archive headers"
msgstr "Glav arhiva ni mogoče brati"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Ni mogoče ustvariti pip"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Ni mogoče izvesti gzip "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Pokvarjen arhiv"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Nadzorna vsota tar ni uspela, arhiv je pokvarjen"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Neznana vrsta glave TAR %u, član %s"
diff --git a/po/sv.po b/po/sv.po
index e29e91a6e..52f65b598 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2010-08-24 21:18+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -25,144 +25,144 @@ msgid "Package %s version %s has an unmet dep:\n"
msgstr ""
"Paketet %s med version %s har ett beroende som inte kan tillfredsställas:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Totalt antal paketnamn: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Totala paketstrukturer: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Vanliga paket: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Helt virtuella paket: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Enstaka virtuella paket: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Blandade virtuella paket: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Saknade: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Totalt antal olika versioner: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Totalt antal olika beskrivningar: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Totalt antal beroenden: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Totalt antal version/filrelationer: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Totalt antal beskrivning/filrelationer: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Totalt antal tillhandahållningsmarkeringar: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Totalt antal sökmönstersträngar: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Totalt bortkastat utrymme: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Totalt utrymme som kan redogöras för: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Paketfilen %s är inte synkroniserad."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Inga paket hittades"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Du måste ange minst ett sökmönster"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Kunde inte hitta paketet %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "\"Package\"-filer:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "Cachen är inte synkroniserad, kan inte korsreferera en paketfil"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Fastnålade paket:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(hittades inte)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Installerad: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Kandidat: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(ingen)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Paketnålning: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Versionstabell:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
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:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -236,20 +236,20 @@ msgstr ""
" -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:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Ange ett namn för denna skiva, exempelvis \"Debian 5.0.3 Disk 1\""
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Mata in en skiva i enheten och tryck på Enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Misslyckades med att montera \"%s\" till \"%s\""
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -257,7 +257,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Upprepa proceduren för resten av cd-skivorna i din uppsättning."
@@ -293,76 +293,71 @@ msgstr ""
" -c=? Läs denna konfigurationsfil.\n"
" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Väljer \"%s\" som källkodspaket istället för \"%s\"\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Ignorera otillgängliga versionen \"%s\" av paketet \"%s\""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunde inte hitta paketet %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s är satt till manuellt installerad.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s är satt till automatiskt installerad.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Internt fel, problemlösaren förstörde någonting"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Kunde inte låsa katalogen %s"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Kunde inte låsa hämtningskatalogen"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "Du måste ange minst ett paket att hämta källkod för"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Kunde inte hitta något källkodspaket för %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -372,7 +367,7 @@ msgstr ""
"på:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, fuzzy, c-format
msgid ""
"Please use:\n"
@@ -383,94 +378,94 @@ msgstr ""
"bzr get %s\n"
"för att hämta senaste (möjligen inte utgivna) uppdateringar av paketet.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Hoppar över redan hämtade filen \"%s\"\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Behöver hämta %sB källkodsarkiv.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Hämtar källkoden %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Misslyckades med att hämta vissa arkiv."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Hämtningen färdig i \"endast-hämta\"-läge"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Packar inte upp redan uppackad källkod i %s\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggkommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Barnprocessen misslyckades"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Misslyckades med att behandla byggberoenden"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunde inte hämta information om byggberoenden för %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har inga byggberoenden.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -479,7 +474,7 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
"hittas"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -488,14 +483,14 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
"hittas"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade "
"paketet %s är för nytt"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -504,7 +499,7 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga "
"versioner av paketet %s tillfredsställer versionskraven"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -513,17 +508,17 @@ msgstr ""
"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
"hittas"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggberoenden för %s kunde inte tillfredsställas."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Misslyckades med att behandla byggberoenden"
@@ -634,11 +629,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Du måste ange minst ett paket att hämta källkod för"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -652,52 +647,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "men det är inte installerat"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s är satt till manuellt installerad.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s är satt till automatiskt installerad.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s är redan den senaste versionen.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s är redan den senaste versionen.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Väntade på %s men den fanns inte där"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "%s är satt till manuellt installerad.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "Misslyckades med att öppna %s"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -918,7 +914,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen"
msgid "Unable to accept connection"
msgstr "Kunde inte ta emot anslutningen"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Problem med att lägga filen till hashtabellen"
@@ -1012,40 +1008,40 @@ msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "Kunde inte ansluta till %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Internt fel: Korrekt signatur men kunde inte fastställa nyckelns "
"fingeravtryck?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Minst en ogiltig signatur träffades på."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"Kunde inte köra \"apt-key\" för att verifiera signatur (är gnupg "
"installerad?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Okänt fel vid körning av apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Följande signaturer är ogiltiga:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1057,31 +1053,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Fel vid skrivning till filen"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Fel vid läsning från server"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Fel vid skrivning till fil"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "\"Select\" misslyckades"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Anslutningen överskred tidsgränsen"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Fel vid skrivning till utdatafil"
@@ -1089,53 +1085,298 @@ msgstr "Fel vid skrivning till utdatafil"
msgid "Waiting for headers"
msgstr "Väntar på rubriker"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Felaktig rubrikrad"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "Http-servern sände ett ogiltigt svarshuvud"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http-servern sände ett ogiltigt Content-Length-rubrik"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-servern sände ett ogiltigt Content-Range-rubrik"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Okänt datumformat"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Felaktiga data i huvud"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Anslutningen misslyckades"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Internt fel"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Korrigerar beroenden..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " misslyckades."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Kunde inte korrigera beroenden"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Kunde inte minimera uppgraderingsuppsättningen"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Färdig"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Du bör köra \"apt-get -f install\" för att korrigera dessa."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Otillfredsställda beroenden. Prova med -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installerat]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installerat]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installerat]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installerat]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "men %s är installerat"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s kommer att installeras"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "men det kan inte installeras"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "men det är ett virtuellt paket"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "men det är inte installerat"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "men det kommer inte att installeras"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " eller"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Följande NYA paket kommer att installeras:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Följande paket kommer att TAS BORT:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Följande paket har hållits tillbaka:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Följande paket kommer att uppgraderas:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Följande paket kommer att NEDGRADERAS:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Följande tillbakahållna paket kommer att ändras:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (på grund av %s) "
+
+#: apt-private/private-output.cc:696
+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 genomföras såvida du inte vet exakt vad du gör!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu att uppgradera, %lu att nyinstallera, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu att installera om, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu att nedgradera, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu att ta bort och %lu att inte uppgradera.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu är inte helt installerade eller borttagna.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Fel vid kompilering av reguljärt uttryck - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Uppdateringskommandot tar inga argument"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"OBSERVERA: Detta är endast en simulation!\n"
+" apt-get behöver root-privilegier för verklig körning.\n"
+" Tänk också på att låsningen är inaktiverad, så\n"
+" förlita dig inte på relevansen till den verkliga situationen!"
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Internt fel. InstallPackages anropades med trasiga paket!"
@@ -1402,251 +1643,6 @@ msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Korrigerar beroenden..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " misslyckades."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Kunde inte korrigera beroenden"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Kunde inte minimera uppgraderingsuppsättningen"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Färdig"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Du bör köra \"apt-get -f install\" för att korrigera dessa."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Otillfredsställda beroenden. Prova med -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installerat]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Installerat]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Installerat]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Installerat]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "men %s är installerat"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "men %s kommer att installeras"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "men det kan inte installeras"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "men det är ett virtuellt paket"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "men det är inte installerat"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "men det kommer inte att installeras"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " eller"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Följande NYA paket kommer att installeras:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Följande paket kommer att TAS BORT:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Följande paket har hållits tillbaka:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Följande paket kommer att uppgraderas:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Följande paket kommer att NEDGRADERAS:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Följande tillbakahållna paket kommer att ändras:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (på grund av %s) "
-
-#: apt-private/private-output.cc:696
-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 genomföras såvida du inte vet exakt vad du gör!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu att uppgradera, %lu att nyinstallera, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu att installera om, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu att nedgradera, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu att ta bort och %lu att inte uppgradera.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu är inte helt installerade eller borttagna.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Fel vid kompilering av reguljärt uttryck - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Uppdateringskommandot tar inga argument"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"OBSERVERA: Detta är endast en simulation!\n"
-" apt-get behöver root-privilegier för verklig körning.\n"
-" Tänk också på att låsningen är inaktiverad, så\n"
-" förlita dig inte på relevansen till den verkliga situationen!"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1702,23 +1698,27 @@ msgstr ""
# Måste vara tre bokstäver(?)
# "Hit" = aktuell version är fortfarande giltig
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Bra "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Bra:%lu %s"
# "Get:" = hämtar ny version
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Läs:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Läs:%lu %s"
# "Ign" = hoppar över
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ign "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ign:%lu %s"
# "Err" = fel vid hämtning
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Fel "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Fel:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1744,18 +1744,18 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Kunde inte läsa %s"
# Felmeddelande för misslyckad chdir
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1831,7 +1831,7 @@ msgstr "meddelandet är viktiga. Försök korrigera dem och kör [I]nstallera ig
msgid "Merging available information"
msgstr "Sammanfogar tillgänglig information"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1855,46 +1855,46 @@ msgstr ""
" -c=? Läs denna konfigurationsfil.\n"
" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Kunde inte ta status på %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Kunde inte skriva till %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Kan inte ta reda på debconf-version. Är debconf installerat?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Listan över filtillägg för Packages är för lång"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Fel vid behandling av katalogen %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Listan över filtillägg för Sources är för lång"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Fel vid skrivning av rubrik till innehållsfil"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Fel vid behandling av innehållet %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1975,11 +1975,11 @@ msgstr ""
" -c=? Läs denna konfigurationsfil\n"
" -o=? Ställ in en godtycklig konfigurationsflagga"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Inga val träffades"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Några filer saknas i paketfilsgruppen \"%s\""
@@ -2093,23 +2093,23 @@ msgstr " Avlänkningsgränsen på %sB nåddes.\n"
msgid "Archive had no package field"
msgstr "Arkivet har inget package-fält"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, 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:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " ansvarig för paketet %s är %s ej %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s har ingen källåsidosättningspost\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s har heller ingen binär åsidosättningspost\n"
@@ -2198,7 +2198,7 @@ msgstr "Problem med att länka ut %s"
msgid "Failed to rename %s to %s"
msgstr "Misslyckades med att byta namn på %s till %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2223,11 +2223,11 @@ msgstr ""
" -c=? Läs denna konfigurationsfil.\n"
" -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Okänd paketpost!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2300,6 +2300,27 @@ msgstr "Kan inte hitta autentiseringspost för: %s"
msgid "Hash mismatch for: %s"
msgstr "Hash-kontrollsumman stämmer inte för: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Metoddrivrutinen %s kunde inte hittas."
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s startade inte korrekt"
+
+#: apt-pkg/acquire-worker.cc:485
+#, 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 på Enter."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "Paketlistan eller statusfilen kunde inte tolkas eller öppnas."
@@ -2313,179 +2334,301 @@ msgid "The list of sources could not be read."
msgstr "Listan över källor kunde inte läsas."
# Felmeddelande
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Paketcachen är tom"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Paketcachefilen är skadad"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Paketcachefilens version är inkompatibel"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "Paketcachefilen är skadad"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Denna APT saknar stöd för versionssystemet \"%s\""
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Paketcachen byggdes för en annan arkitektur"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Beroende av"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Förberoende av"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Föreslår"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Rekommenderar"
# "Konfliktar"?
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Står i konflikt med"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Ersätter"
# "Föråldrar"?
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Föråldrar"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Gör sönder"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Utökar"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "viktigt"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "nödvändigt"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "valfri"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "extra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Beräknar uppgradering"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Metoddrivrutinen %s kunde inte hittas."
+msgid "Index file type '%s' is not supported"
+msgstr "Indexfiler av typ \"%s\" stöds inte"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s startade inte korrekt"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Rad %lu i källistan %s har fel format ([option] ej tolkningsbar)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, 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 på Enter."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Rad %lu i källistan %s har fel format ([option] för kort)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Rad %lu i källistan %s har fel format ([%s] är inte en tilldelning)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Rad %lu i källistan %s har fel format ([%s] saknar nyckel)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Rad %lu i källistan %s har fel format ([%s] nyckeln %s saknar värde)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Rad %lu i källistan %s har (URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Rad %lu i källistan %s har fel format (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Rad %lu i källistan %s har fel format (Absolut dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Öppnar %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Rad %u är för lång i källistan %s."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Rad %u i källistan %s har fel format (typ)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "Indexfiler av typ \"%s\" stöds inte"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Bygger beroendeträd"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Kunde inte ta status på %s."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Kandiderande versioner"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Cachen har ett inkompatibelt versionssystem"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Beroendegenerering"
+# NewPackage etc. är funktionsnamn
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Fel uppstod vid hantering av %s (FindPkg)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Läser tillståndsinformation"
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Grattis, du överskred antalet paketnamn som denna APT kan hantera."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Grattis, du överskred antalet versioner som denna APT kan hantera."
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:279
+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:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Grattis, du överskred antalet beroenden som denna APT kan hantera."
+
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Misslyckades med att öppna StateFile %s"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Paketet %s %s hittades inte när filberoenden hanterades"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Misslyckades med att skriva temporär StateFile %s"
+msgid "Couldn't stat source package list %s"
+msgstr "Kunde inte ta status på källkodspaketlistan %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Läser paketlistor"
+
+# Bättre ord?
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Samlar filtillhandahållningar"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "In-/utfel vid lagring av källcache"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "namnbyte misslyckades, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Hash-kontrollsumman stämmer inte"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Storleken stämmer inte"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Felaktig åtgärd %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Skrivfel"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2496,7 +2639,7 @@ msgstr ""
"%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG-fel: %s: %s"
@@ -2512,49 +2655,49 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Kunde inte tolka \"Release\"-filen %s"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2563,126 +2706,53 @@ msgstr ""
"Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du "
"manuellt måste reparera detta paket (på grund av saknad arkitektur)."
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Paketindexfilerna är skadede. Inget \"Filename:\"-fält för paketet %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Cachen har ett inkompatibelt versionssystem"
-
-# NewPackage etc. är funktionsnamn
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Fel uppstod vid hantering av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Grattis, du överskred antalet paketnamn som denna APT kan hantera."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Grattis, du överskred antalet versioner som denna APT kan hantera."
-
-#: apt-pkg/pkgcachegen.cc:279
-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:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Grattis, du överskred antalet beroenden som denna APT kan hantera."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Paketet %s %s hittades inte när filberoenden hanterades"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kunde inte ta status på källkodspaketlistan %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Läser paketlistor"
-
-# Bättre ord?
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Samlar filtillhandahållningar"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "In-/utfel vid lagring av källcache"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Leverantörsblocket %s saknar fingeravtryck"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Listkatalogen %spartial saknas."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Arkivkatalogen %spartial saknas."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Indexfiler av typ \"%s\" stöds inte"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "Kunde inte låsa katalogen %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Hämtar fil %li av %li (%s återstår)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Hämtar fil %li av %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-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/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
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"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Kunde inte ta status på %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2705,7 +2775,7 @@ msgstr "Förstod inte nåltypen %s"
msgid "No priority (or zero) specified for pin"
msgstr "Prioritet ej angiven (eller noll) för nål"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2714,12 +2784,12 @@ msgstr ""
"Kunde inte genomföra omedelbar konfiguration på \"%s\". Se man 5 apt.conf "
"under APT::Immediate-Configure för information. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "Kunde inte öppna filen \"%s\""
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2731,10 +2801,14 @@ msgstr ""
"Detta är oftast en dålig idé, men om du verkligen vill göra det kan du "
"aktivera flaggan \"APT::Force-LoopBreak\"."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Rad %u är för lång i källistan %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+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/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2805,11 +2879,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Kopierar paketlistor..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Skriver ny källista\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Poster i källistan för denna skiva:\n"
@@ -2820,7 +2894,7 @@ msgid ""
msgstr ""
"Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2828,139 +2902,40 @@ msgstr ""
"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på "
"tillbakahållna paket."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Kunde inte tolka paketfilen %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Kunde inte tolka paketfilen %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Kunde inte tolka \"Release\"-filen %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Inga sektioner i Release-filen %s"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Ingen Hash-post i Release-filen %s"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ogiltig \"Date\"-post i Release-filen %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Rad %lu i källistan %s har fel format ([option] ej tolkningsbar)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Rad %lu i källistan %s har fel format ([option] för kort)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Rad %lu i källistan %s har fel format ([%s] är inte en tilldelning)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Rad %lu i källistan %s har fel format ([%s] saknar nyckel)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Rad %lu i källistan %s har fel format ([%s] nyckeln %s saknar värde)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Rad %lu i källistan %s har (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Rad %lu i källistan %s har fel format (dist)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Bygger beroendeträd"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Kandiderande versioner"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Rad %lu i källistan %s har fel format (Absolut dist)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Beroendegenerering"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Läser tillståndsinformation"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "Öppnar %s"
+msgid "Failed to open StateFile %s"
+msgstr "Misslyckades med att öppna StateFile %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Rad %u i källistan %s har fel format (typ)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Misslyckades med att skriva temporär StateFile %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
-
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Kunde inte tolka paketfilen %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2972,49 +2947,49 @@ msgstr "Utgåvan \"%s\" för \"%s\" hittades inte"
msgid "Version '%s' for '%s' was not found"
msgstr "Version \"%s\" för \"%s\" hittades inte"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Kunde inte hitta funktionen \"%s\""
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Kunde inte hitta något paket enligt reguljära uttrycket \"%s\""
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
"Kan inte välja versioner från paketet \"%s\" eftersom det är helt virtuellt"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Kan inte välja senaste version från paketet \"%s\" eftersom det är helt "
"virtuellt"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
"Kan inte välja kandidatversion från paketet %s eftersom det inte har någon "
"kandidat"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Kan inte välja installerad version från paketet %s eftersom det inte är "
"installerat"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3023,179 +2998,59 @@ msgstr ""
"Kan inte välja installerad version eller kandidatversion från paketet \"%s\" "
"eftersom det inte har någon av dem"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Installerar %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Konfigurerar %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Tar bort %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "Tar bort hela %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Uppmärksammar försvinnandet av %s"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Kör efterinstallationsutlösare %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Katalogen \"%s\" saknas"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Kunde inte öppna filen \"%s\""
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Förbereder %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Unpacking %s"
-msgstr "Packar upp %s"
+msgid "Unable to parse Release file %s"
+msgstr "Kunde inte tolka \"Release\"-filen %s"
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Preparing to configure %s"
-msgstr "Förbereder konfigurering av %s"
+msgid "No sections in Release file %s"
+msgstr "Inga sektioner i Release-filen %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Installed %s"
-msgstr "Installerade %s"
+msgid "No Hash entry in Release file %s"
+msgstr "Ingen Hash-post i Release-filen %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Förbereder borttagning av %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ogiltig \"Valid-Until\"-post i Release-filen %s"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Removed %s"
-msgstr "Tog bort %s"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ogiltig \"Date\"-post i Release-filen %s"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Förbereder borttagning av hela %s"
+msgid "%lid %lih %limin %lis"
+msgstr "%lid %lih %limin %lis"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Completely removed %s"
-msgstr "Tog bort hela %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Kunde inte skriva till %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr "Ingen apport-rapport skrevs därför att MaxReports redan har uppnåtts"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "beroendeproblem - lämnar okonfigurerad"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att det är "
-"ett efterföljande fel från ett tidigare problem."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
-"diskutrymmet är slut"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet "
-"är slut"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
-"diskutrymmet är slut"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Ingen apport-rapport skrevs därför att felmeddelandet indikerar ett in-/ut-"
-"fel för dpkg"
+msgid "%lih %limin %lis"
+msgstr "%lih %limin %lis"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Kunde inte låsa administrationskatalogen (%s). Använder en annan process den?"
+msgid "%limin %lis"
+msgstr "%limin %lis"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Kunde inte låsa administrationskatalogen (%s). Är du root?"
+msgid "%lis"
+msgstr "%lis"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"dpkg avbröts. Du måste köra \"%s\" manuellt för att korrigera problemet. "
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Inte låst"
+msgid "Selection %s not found"
+msgstr "Valet %s hittades inte"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3330,35 +3185,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Färdig"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%limin %lis"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%lis"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Valet %s hittades inte"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Kan inte utföra mmap på en tom fil"
@@ -3424,108 +3250,277 @@ msgstr "Kunde inte ta status på monteringspunkten %s."
msgid "Failed to stat the cdrom"
msgstr "Kunde inte ta status på cd-romen."
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Okänd typförkortning: \"%c\""
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Öppnar konfigurationsfilen %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Syntaxfel %s:%u: Block börjar utan namn."
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntaxfel %s:%u: Felformat märke"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Syntaxfel %s:%u: Överflödigt skräp efter värde"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Syntaxfel %s:%u: För många nästlade inkluderingar"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntaxfel %s:%u: Inkluderad härifrån"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stöds inte"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "Syntaxfel %s:%u: clear-direktivet kräver ett flaggträd som argument"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Syntaxfel %s:%u: Överflödigt skräp vid filens slut"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Kommandoradsflaggan \"%c\" [från %s] är inte känd."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Förstår inte kommandoradsflaggan %s"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Kommandoradsflaggan %s är inte boolsk"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Flaggan %s kräver ett argument."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
"Flaggan %s: Den angivna konfigurationsposten måste innehålla ett =<värde>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "Flaggan %s kräver ett heltalsargument, inte \"%s\""
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Flaggan \"%s\" är för lång"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "Förstår inte %s, prova med \"true\" eller \"false\"."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Felaktig åtgärd %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Installerar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Konfigurerar %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Tar bort %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "Tar bort hela %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Uppmärksammar försvinnandet av %s"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Kör efterinstallationsutlösare %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Katalogen \"%s\" saknas"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Kunde inte öppna filen \"%s\""
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Förbereder %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Packar upp %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Förbereder konfigurering av %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "Installerade %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Förbereder borttagning av %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "Tog bort %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Förbereder borttagning av hela %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "Tog bort hela %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Kunde inte skriva till %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr "Ingen apport-rapport skrevs därför att MaxReports redan har uppnåtts"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "beroendeproblem - lämnar okonfigurerad"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att det är "
+"ett efterföljande fel från ett tidigare problem."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
+"diskutrymmet är slut"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att minnet "
+"är slut"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Ingen apport-rapport skrevs därför att felmeddelandet indikerar att "
+"diskutrymmet är slut"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Ingen apport-rapport skrevs därför att felmeddelandet indikerar ett in-/ut-"
+"fel för dpkg"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Kunde inte låsa administrationskatalogen (%s). Använder en annan process den?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Kunde inte låsa administrationskatalogen (%s). Är du root?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"dpkg avbröts. Du måste köra \"%s\" manuellt för att korrigera problemet. "
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Inte låst"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "DropNode anropat på fortfarande länkad nod"
@@ -3630,7 +3625,7 @@ msgstr "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas"
msgid "Internal error, could not locate member %s"
msgstr "Internt fel, kunde inta hitta delen %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Kunde inte tolka control-filen"
@@ -3659,23 +3654,23 @@ msgstr "Arkivet är för kort"
msgid "Failed to read the archive headers"
msgstr "Misslyckades med att läsa arkivrubriker"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Misslyckades med att skapa rör"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Misslyckades med att köra gzip"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Skadat arkiv"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar-kontrollsumma misslyckades, arkivet skadat"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Okänd TAR-rubriktyp %u, del %s"
diff --git a/po/th.po b/po/th.po
index df4c5b65c..60a468ea4 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
-"PO-Revision-Date: 2014-04-20 09:38+0700\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
+"PO-Revision-Date: 2014-12-12 13:00+0700\n"
"Last-Translator: Theppitak Karoonboonyanan <thep@debian.org>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\n"
"Language: th\n"
@@ -23,144 +23,144 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "แพกเกจ %s รุ่น %s ขาดแพกเกจที่ต้องใช้:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "จำนวนชื่อแพกเกจทั้งหมด: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "จำนวนโครงสร้างแพกเกจทั้งหมด: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " แพกเกจปกติ: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " แพกเกจเสมือนแท้ๆ: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " แพกเกจเสมือนที่มีแพกเกจจริงเดียว: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " แพกเกจเสมือนผสม: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " แพกเกจที่ขาดหาย: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "จำนวนรุ่นที่แตกต่างกันทั้งหมด: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "จำนวนคำบรรยายแพกเกจที่แตกต่างกันทั้งหมด: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "จำนวนการเชื่อมโยงระหว่างแพกเกจทั้งหมด: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "จำนวนความสัมพันธ์ รุ่น/แฟ้ม ทั้งหมด: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "จำนวนความสัมพันธ์ คำบรรยาย/แฟ้ม ทั้งหมด: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "จำนวนผังการตระเตรียมทั้งหมด: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "จำนวนสตริงทั้งหมด: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "พื้นที่สำรองทั้งหมด: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "พื้นที่ที่นับรวมทั้งหมด: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "ข้อมูลแฟ้ม Package %s ไม่ตรงกับความเป็นจริง"
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "ไม่พบแพกเกจ"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "คุณต้องระบุแพตเทิร์นสำหรับค้นหาอย่างน้อยหนึ่งแพตเทิร์น"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แล้ว กรุณาใช้ 'apt-mark showauto' แทน"
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "ไม่พบแพกเกจ %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "แฟ้มแพกเกจ:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "ข้อมูลแคชไม่ตรงกับความเป็นจริงแล้ว ไม่สามารถอ้างอิงไขว้ระหว่างแฟ้มแพกเกจ"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "แพกเกจที่ถูกตรึง:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(ไม่พบ)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " ที่ติดตั้งอยู่: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " รุ่นที่ติดตั้งได้: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(ไม่มี)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " การตรึงแพกเกจ: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " ตารางรุ่น:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s สำหรับ %s คอมไพล์เมื่อ %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -230,20 +230,20 @@ msgstr ""
" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
"กรุณาอ่านข้อมูลเพิ่มเติมจาก manual page apt-cache(8) และ apt.conf(5)\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "กรุณาตั้งชื่อแผ่น เช่น 'Debian 5.0.3 Disk 1'"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "กรุณาใส่แผ่นลงในไดรว์แล้วกด enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "ไม่สามารถเมานท์ '%s' ที่ '%s'"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -254,7 +254,7 @@ msgstr ""
"คุณอาจลองใช้ตัวเลือก --cdrom เพื่อกำหนดจุดเมานท์ของซีดีรอมได้\n"
"อ่านข้อมูลเพิ่มเติมเกี่ยวกับการตรวจซีดีรอมอัตโนมัติและจุดเมานท์ได้จาก 'man apt-cdrom'"
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "ทำเช่นนี้ต่อไปกับแผ่นซีดีที่เหลือในชุด"
@@ -290,76 +290,71 @@ msgstr ""
" -c=? อ่านแฟ้มค่าตั้งที่กำหนด\n"
" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "ไม่พบแพกเกจสำหรับสถาปัตยกรรม '%s'"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "ไม่พบแพกเกจ '%s' ที่มีรุ่นเป็น '%s'"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "ไม่พบแพกเกจ '%s' ที่มีชุดจัดแจกเป็น '%s'"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "จะเลือก '%s' เป็นแพกเกจซอร์สแทน '%s'\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "ไม่พบรุ่น '%s' ของแพกเกจ '%s'"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "ไม่พบแพกเกจ %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "กำหนด %s ให้เป็นการติดตั้งแบบอัตโนมัติแล้ว\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แล้ว กรุณาใช้ 'apt-mark auto' และ 'apt-mark manual' แทน"
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "ไม่สามารถล็อคไดเรกทอรี %s"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -368,7 +363,7 @@ msgstr ""
"ข้อสังเกต: การจัดทำแพกเกจ '%s' พัฒนาผ่านระบบควบคุมรุ่น '%s' อยู่ที่:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -379,67 +374,67 @@ msgstr ""
"bzr branch %s\n"
"เพื่อดึงรุ่นล่าสุด (ที่อาจยังไม่ปล่อยออกมา) ของตัวแพกเกจ\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "ดาวน์โหลดซอร์ส %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม"
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "คำสั่ง build '%s' ล้มเหลว\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "โพรเซสลูกล้มเหลว"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -447,27 +442,27 @@ msgid ""
msgstr ""
"ไม่มีข้อมูลสถาปัตยกรรมสำหรับ %s ดูวิธีตั้งค่าที่หัวข้อ APT::Architectures ของ apt.conf(5)"
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -475,19 +470,19 @@ msgid ""
msgstr ""
"ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่สามารถใช้ %s กับแพกเกจ '%s' ได้"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, 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:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -496,24 +491,24 @@ msgstr ""
"ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s "
"รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะ %s ไม่มีรุ่นที่ติดตั้งได้"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้"
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ"
@@ -615,18 +610,17 @@ msgstr ""
#: cmdline/apt-helper.cc:36
msgid "Need one URL as argument"
-msgstr ""
+msgstr "ต้องการ URL หนึ่งรายการเป็นอาร์กิวเมนต์"
#: cmdline/apt-helper.cc:49
msgid "Must specify at least one pair url/filename"
msgstr "ต้องระบุคู่ URL, ชื่อแฟ้ม อย่างน้อยหนึ่งคู่"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr "ดาวน์โหลดไม่สำเร็จ"
-#: cmdline/apt-helper.cc:82
-#, fuzzy
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -646,55 +640,57 @@ msgstr ""
"\n"
"คำสั่ง:\n"
" download-file - ดาวน์โหลด URI ที่กำหนดลงในพาธปลายทาง\n"
+" auto-detect-proxy - ตรวจหาพร็อกซีโดยใช้ apt.conf\n"
"\n"
" โปรแกรมช่วยเหลือของ APT นี้มีพลัง Super Meep\n"
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "%s ไม่สามารถทำเครื่องหมายได้ เพราะไม่ได้ติดตั้งไว้\n"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s ถูกกำหนดให้เป็นการติดตั้งแบบเลือกเองอยู่ก่อนแล้ว\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s ถูกกำหนดให้เป็นการติดตั้งแบบอัตโนมัติอยู่ก่อนแล้ว\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr "%s ถูกกำหนดให้คงรุ่นอยู่ก่อนแล้ว\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้ว\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr "กำหนด %s ให้คงรุ่นแล้ว\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "ยกเลิกการคงรุ่นของ %s แล้ว\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr "เรียกทำงาน dpkg ไม่สำเร็จ คุณเป็น root หรือเปล่า?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -952,7 +948,7 @@ msgstr "หมดเวลารอเชื่อมต่อซ็อกเก
msgid "Unable to accept connection"
msgstr "ไม่สามารถรับการเชื่อมต่อ"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม"
@@ -1041,21 +1037,21 @@ msgstr "เกิดปัญหาร้ายแรงบางอย่าง
msgid "Unable to connect to %s:%s:"
msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr "ไม่สามารถเรียก 'apt-key' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gnupg ไว้หรือไม่?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1064,15 +1060,15 @@ msgstr ""
"แฟ้มที่เซ็นกำกับครอบข้อความมีเนื้อหาไม่ถูกต้อง ได้รับผลลัพธ์ "
"'%s' (เครือข่ายต้องยืนยันตัวบุคคลหรือไม่?)"
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1082,31 +1078,31 @@ msgstr "ลายเซ็นต่อไปนี้ไม่สามารถ
msgid "Empty files can't be valid archives"
msgstr "แฟ้มว่างเปล่าไม่สามารถเป็นแฟ้มจัดเก็บที่ใช้การได้"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "select ไม่สำเร็จ"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "หมดเวลารอเชื่อมต่อ"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์"
@@ -1114,53 +1110,293 @@ msgstr "เกิดข้อผิดพลาดขณะเขียนลง
msgid "Waiting for headers"
msgstr "รอหัวข้อมูล"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "บรรทัดข้อมูลส่วนหัวผิดพลาด"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัวตอบมาไม่ถูกต้อง"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Length มาไม่ถูกต้อง"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "เซิร์ฟเวอร์ HTTP ส่งข้อมูลส่วนหัว Content-Range มาไม่ถูกต้อง"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "การสนับสนุน Content-Range ที่เซิร์ฟเวอร์ HTTP ผิดพลาด"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "ข้อมูลส่วนหัวผิดพลาด"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "เชื่อมต่อไม่สำเร็จ"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "ข้อผิดพลาดภายใน"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "กำลังแสดงรายชื่อ"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "มีอีก %i รุ่น กรุณาใช้ตัวเลือก '-a' หากต้องการดูเพิ่ม"
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " ล้มเหลว"
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " เสร็จแล้ว"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "คุณอาจต้องเรียก 'apt-get -f install' เพื่อแก้ปัญหาเหล่านี้"
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -f"
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "ไม่ทราบ"
+
+#: apt-private/private-output.cc:265
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[ติดตั้งอยู่,สามารถปรับรุ่นเป็น: %s]"
+
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr "[ติดตั้งอยู่,ในเครื่อง]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[ติดตั้งอยู่,ถอดถอนอัตโนมัติได้]"
+
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr "[ติดตั้งอยู่,อัตโนมัติ]"
+
+#: apt-private/private-output.cc:274
+msgid "[installed]"
+msgstr "[ติดตั้งอยู่]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[สามารถปรับรุ่นจาก: %s]"
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr "[ค่าตั้งตกค้าง]"
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "แต่รุ่นที่จะติดตั้งคือ %s"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "แต่ไม่สามารถติดตั้งได้"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "แต่ไม่ได้ติดตั้งไว้"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " หรือ"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "จะคงรุ่นแพกเกจต่อไปนี้:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (เนื่องจาก %s) "
+
+#: apt-private/private-output.cc:696
+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"
+"คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "ติดตั้งซ้ำ %lu, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "ปรับรุ่นลง %lu, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"มี %i แพกเกจสามารถปรับรุ่นได้ เรียก 'apt list --upgradable' หากต้องการดูรายชื่อ\n"
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr "ปรับรุ่นทุกแพกเกจเป็นรุ่นล่าสุดแล้ว"
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "กำลังเรียงลำดับ"
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "มีอีก %i ระเบียน กรุณาใช้ตัวเลือก '-a' หากต้องการดูเพิ่ม"
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "ไม่ใช่แพกเกจจริง (เสมือน)"
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"หมายเหตุ: นี่เป็นเพียงการจำลองการทำงานเท่านั้น!\n"
+" การทำงานจริงของ apt-get ต้องอาศัยสิทธิ์ผู้ดูแลระบบ\n"
+" อย่าลืมด้วยว่าการล็อคก็ไม่ทำงานเช่นกัน\n"
+" ดังนั้น อย่าถือผลลัพธ์นี้ว่าตรงกับสภาพความเป็นจริงของระบบ!"
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "เกิดข้อผิดพลาดภายใน: มีการเรียก InstallPackages ด้วยแพกเกจที่เสีย!"
@@ -1407,245 +1643,6 @@ msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้
msgid "Package '%s' is not installed, so not removed\n"
msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "กำลังแสดงรายชื่อ"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] "มีอีก %i รุ่น กรุณาใช้ตัวเลือก '-a' หากต้องการดูเพิ่ม"
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "กำลังแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจ..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " ล้มเหลว"
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "ไม่สามารถแก้ปัญหาความขึ้นต่อกันระหว่างแพกเกจได้"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "ไม่สามารถจำกัดรายการปรับรุ่นให้น้อยที่สุดได้"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " เสร็จแล้ว"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "คุณอาจต้องเรียก 'apt-get -f install' เพื่อแก้ปัญหาเหล่านี้"
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "รายการแพกเกจที่ต้องใช้ไม่ครบ กรุณาลองใช้ตัวเลือก -f"
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "ไม่ทราบ"
-
-#: apt-private/private-output.cc:265
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[ติดตั้งอยู่,สามารถปรับรุ่นเป็น: %s]"
-
-#: apt-private/private-output.cc:268
-msgid "[installed,local]"
-msgstr "[ติดตั้งอยู่,ในเครื่อง]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr "[ติดตั้งอยู่,ถอดถอนอัตโนมัติได้]"
-
-#: apt-private/private-output.cc:272
-msgid "[installed,automatic]"
-msgstr "[ติดตั้งอยู่,อัตโนมัติ]"
-
-#: apt-private/private-output.cc:274
-msgid "[installed]"
-msgstr "[ติดตั้งอยู่]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[สามารถปรับรุ่นจาก: %s]"
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr "[ค่าตั้งตกค้าง]"
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "แต่รุ่นที่ติดตั้งไว้คือ %s"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "แต่รุ่นที่จะติดตั้งคือ %s"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "แต่ไม่สามารถติดตั้งได้"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "แต่แพกเกจนี้เป็นแพกเกจเสมือน"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "แต่ได้ติดตั้งไว้"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "แต่แพกเกจนี้จะไม่ถูกติดตั้ง"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " หรือ"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "แพกเกจต่อไปนี้ขาดแพกเกจที่ต้องใช้:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "จะติดตั้งแพกเกจ *ใหม่* ต่อไปนี้:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "จะ *ลบ* แพกเกจต่อไปนี้:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "จะคงรุ่นแพกเกจต่อไปนี้:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ขึ้น:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "จะปรับรุ่นแพกเกจต่อไปนี้ *ลง*:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "จะเปลี่ยนแปลงรายการคงรุ่นแพกเกจต่อไปนี้:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (เนื่องจาก %s) "
-
-#: apt-private/private-output.cc:696
-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"
-"คุณ *ไม่ควร* ทำเช่นนี้ นอกจากคุณเข้าใจสิ่งที่จะทำ!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "ปรับรุ่นขึ้น %lu, ติดตั้งใหม่ %lu, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "ติดตั้งซ้ำ %lu, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "ปรับรุ่นลง %lu, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "ถอดถอน %lu และไม่ปรับรุ่น %lu\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "ติดตั้งหรือถอดถอนไม่ครบ %lu\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[Y/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[y/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "Y"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "N"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] "มีอีก %i ระเบียน กรุณาใช้ตัวเลือก '-a' หากต้องการดูเพิ่ม"
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "ไม่ใช่แพกเกจจริง (เสมือน)"
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"หมายเหตุ: นี่เป็นเพียงการจำลองการทำงานเท่านั้น!\n"
-" การทำงานจริงของ apt-get ต้องอาศัยสิทธิ์ผู้ดูแลระบบ\n"
-" อย่าลืมด้วยว่าการล็อคก็ไม่ทำงานเช่นกัน\n"
-" ดังนั้น อย่าถือผลลัพธ์นี้ว่าตรงกับสภาพความเป็นจริงของระบบ!"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1699,20 +1696,24 @@ msgid "Full Text Search"
msgstr "ค้นทั่วทั้งเนื้อความ"
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "เจอ "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "เจอ:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "ดึง:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "ดึง:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "ข้าม "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "ข้าม:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "ปัญหา "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "ปัญหา:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1738,17 +1739,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "ไม่สามารถอ่าน %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1820,7 +1821,7 @@ msgstr "กรุณาแก้ปัญหาเหล่านั้น แ
msgid "Merging available information"
msgstr "กำลังผสานรายชื่อของแพกเกจที่มี"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1844,46 +1845,46 @@ msgstr ""
" -c=? อ่านแฟ้มค่าตั้งนี้\n"
" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, c-format
msgid "Unable to mkstemp %s"
msgstr "ไม่สามารถ mkstemp %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "ไม่สามารถเขียนลงแฟ้ม %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "ไม่สามารถอ่านรุ่นของ debconf ได้ ได้ติดตั้ง debconf ไว้หรือไม่?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "รายชื่อนามสกุลแพกเกจยาวเกินไป"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "เกิดข้อผิดพลาดขณะประมวลผลไดเรกทอรี %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "รายชื่อนามสกุลซอร์สยาวเกินไป"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "เกิดข้อผิดพลาดขณะเขียนข้อมูลส่วนหัวลงในแฟ้มสารบัญ"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "เกิดข้อผิดพลาดขณะประมวลผลสารบัญ %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1960,11 +1961,11 @@ msgstr ""
" -c=? อ่านแฟ้มค่าตั้งนี้\n"
" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "ไม่มีรายการเลือกที่ตรง"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "บางแฟ้มขาดหายไปในกลุ่มแฟ้มแพกเกจ `%s'"
@@ -1997,9 +1998,8 @@ msgid "Failed to stat %s"
msgstr "stat %s ไม่สำเร็จ"
#: ftparchive/cachedb.cc:326
-#, fuzzy
msgid "Failed to read .dsc"
-msgstr "readlink %s ไม่สำเร็จ"
+msgstr "อ่าน .dsc ไม่สำเร็จ"
#: ftparchive/cachedb.cc:359
msgid "Archive has no control record"
@@ -2074,22 +2074,22 @@ msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB
msgid "Archive had no package field"
msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s ไม่มีข้อมูล override\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " ผู้ดูแล %s คือ %s ไม่ใช่ %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ไม่มีข้อมูล override สำหรับซอร์ส\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n"
@@ -2175,7 +2175,7 @@ msgstr "มีปัญหาขณะลบแฟ้ม %s"
msgid "Failed to rename %s to %s"
msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไปเป็น %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2200,11 +2200,11 @@ msgstr ""
" -c=? อ่านแฟ้มค่าตั้งนี้\n"
" -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "พบระเบียนแพกเกจที่ไม่รู้จัก!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2276,6 +2276,26 @@ msgstr "ไม่พบระเบียนยืนยันความแท
msgid "Hash mismatch for: %s"
msgstr "แฮชไม่ตรงกันสำหรับ: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s"
+
+#: apt-pkg/acquire-worker.cc:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "ได้ติดตั้งแพกเกจ %s ไว้หรือไม่?"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "ไม่สามารถเรียกทำงานวิธีการ %s"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "ไม่สามารถแจงหรือเปิดรายชื่อแพกเกจหรือสถานะแพกเกจได้"
@@ -2288,175 +2308,296 @@ msgstr "คุณอาจเรียก `apt-get update' เพื่อแก
msgid "The list of sources could not be read."
msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้"
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "แคชของแพกเกจว่างเปล่า"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "แฟ้มแคชของแพกเกจเสียหาย"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "แฟ้มแคชของแพกเกจเป็นคนละรุ่นกัน"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr "แฟ้มแคชของแพกเกจเสียหาย แฟ้มมีขนาดเล็กกว่าที่ควรจะเป็น"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "APT รุ่นนี้ไม่รองรับระบบนับรุ่นแบบ '%s'"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "แคชของแพกเกจถูกสร้างมาสำหรับสถาปัตยกรรมอื่น"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "ต้องใช้"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "ต้องใช้ขณะติดตั้ง"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "แนะนำ"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "ควรใช้ร่วมกับ"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "ขัดแย้งกับ"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "แทนที่"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "ใช้แทน"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "ทำให้พัง"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "เพิ่มความสามารถ"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "สำคัญ"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "จำเป็น"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "มาตรฐาน"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "ตัวเลือก"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "ส่วนเสริม"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "กำลังคำนวณการปรับรุ่น"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "ไม่พบไดรเวอร์สำหรับวิธีการ %s"
+msgid "Index file type '%s' is not supported"
+msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, c-format
-msgid "Is the package %s installed?"
-msgstr "ได้ติดตั้งแพกเกจ %s ไว้หรือไม่?"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "วรรคที่ %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "ไม่สามารถเรียกทำงานวิธีการ %s"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] แจงไม่ผ่าน)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "กรุณาใส่แผ่นชื่อ: '%s' ลงในไดรว์ '%s' แล้วกด enter"
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] สั้นเกินไป)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่ใช่การกำหนดค่า)"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "กำลังสร้างโครงสร้างลำดับความสัมพันธ์"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่มีคีย์)"
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "รุ่นแพกเกจที่มี"
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] คีย์ %s ไม่มีค่า)"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "สร้างลำดับความสัมพันธ์"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "กำลังอ่านข้อมูลสถานะ"
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)"
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:217
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s"
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "กำลังเปิด %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "ไม่รู้จักชนิด '%s' ที่วรรคที่ %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr "ไม่รองรับการล้างข้อมูลที่ %s"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "ไม่สามารถ stat %s"
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "แคชมีระบบนับรุ่นที่ไม่ตรงกัน"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว"
+
+#: apt-pkg/pkgcachegen.cc:591
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม"
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "กำลังอ่านรายชื่อแพกเกจ"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "ส่งสภาวการณ์ไปยังกลไกการแก้ปัญหา"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "เตรียมรับคำตอบ"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> %s)"
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "ผลรวมแฮชไม่ตรงกัน"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "ขนาดไม่ตรงกัน"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
msgid "Invalid file format"
msgstr "รูปแบบของแฟ้มไม่ถูกต้อง"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "การเขียนข้อมูลผิดพลาด"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
#, fuzzy
msgid "Does not start with a cleartext signature"
msgstr "แฟ้ม %s ไม่ได้ขึ้นต้นด้วยการระบุการเซ็นกำกับครอบในตัวข้อความ"
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2466,7 +2607,7 @@ msgstr ""
"ข้อผิดพลาดจาก GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "ข้อผิดพลาดจาก GPG: %s: %s"
@@ -2482,14 +2623,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2498,16 +2639,16 @@ msgstr ""
"ไม่พบรายการ '%s' ที่ต้องการในแฟ้ม Release (รายการ sources.list ไม่ถูกต้อง "
"หรือแฟ้มผิดรูปแบบ)"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "ไม่พบผลรวมแฮชสำหรับ '%s' ในแฟ้ม Release"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2516,140 +2657,72 @@ msgstr ""
"แฟ้ม Release สำหรับ %s หมดอายุแล้ว (ตั้งแต่ %s ที่แล้ว) จะไม่ใช้รายการปรับรุ่นต่างๆ "
"ของคลังแพกเกจนี้"
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, 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:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s"
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "แคชมีระบบนับรุ่นที่ไม่ตรงกัน"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนชื่อแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนรุ่นแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนคำบรรยายแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "โอ้ คุณมาถึงขีดจำกัดจำนวนความสัมพันธ์ระหว่างแพกเกจที่ APT สามารถรองรับได้แล้ว"
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "กำลังอ่านรายชื่อแพกเกจ"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "บล็อคผู้ผลิต %s ไม่มีลายนิ้วมือ"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "ไม่มีไดเรกทอรีรายชื่อแพกเกจ %spartial"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "ไม่มีไดเรกทอรีแพกเกจ %spartial"
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "ไม่รองรับแฟ้มดัชนีชนิด '%s'"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "ไม่สามารถล็อคไดเรกทอรี %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li (เหลืออีก %s)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "กำลังดาวน์โหลดแฟ้มที่ %li จาก %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr "ดาวน์โหลดแฟ้มดัชนีบางแฟ้มไม่สำเร็จ จะข้ามรายการดังกล่าวไป หรือใช้ข้อมูลเก่าแทน"
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "คุณต้องเพิ่ม URI ชนิด 'source' ใน sources.list ของคุณด้วย"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "ไม่สามารถ stat %s"
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2671,7 +2744,7 @@ msgstr "ไม่เข้าใจชนิดการตรึง %s"
msgid "No priority (or zero) specified for pin"
msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2680,12 +2753,12 @@ msgstr ""
"ไม่สามารถตั้งค่า '%s' แบบทันทีได้ กรุณาอ่านรายละเอียดเพิ่มเติมจาก man 5 apt.conf ที่หัวข้อ "
"APT::Immediate-Configure (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr "ไม่สามารถตั้งค่า '%s'"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2697,10 +2770,11 @@ msgstr ""
"ซึ่งแพกเกจดังกล่าวเป็นแพกเกจที่จำเป็นสำหรับระบบ การลบดังกล่าวมักเป็นอันตราย "
"แต่ถ้าคุณต้องการทำเช่นนั้นจริงๆ ก็ให้เปิดตัวเลือก APT::Force-LoopBreak"
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป"
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr "ดาวน์โหลดแฟ้มดัชนีบางแฟ้มไม่สำเร็จ จะข้ามรายการดังกล่าวไป หรือใช้ข้อมูลเก่าแทน"
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2769,11 +2843,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "กำลังคัดลอกรายชื่อแพกเกจ..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "กำลังเขียนรายชื่อแหล่งแพกเกจแหล่งใหม่\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "บรรทัดรายชื่อแหล่งแพกเกจสำหรับแผ่นนี้คือ:\n"
@@ -2783,7 +2857,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "จำเป็นต้องติดตั้งแพกเกจ %s ซ้ำ แต่หาตัวแพกเกจไม่พบ"
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2791,139 +2865,40 @@ msgstr ""
"ข้อผิดพลาด: pkgProblemResolver::Resolve สร้างคำตอบที่ทำให้เกิดแพกเกจเสีย "
"อาจเกิดจากแพกเกจที่ถูกกำหนดให้คงรุ่นไว้"
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "ไม่สามารถแก้ปัญหาได้ คุณได้คงรุ่นแพกเกจที่เสียอยู่ไว้"
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "ส่งสภาวการณ์ไปยังกลไกการแก้ปัญหา"
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา"
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr "เตรียมรับคำตอบ"
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม"
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "ไม่สามารถแจงแฟ้ม Release %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "ไม่มีหัวข้อย่อยในแฟ้ม Release %s"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "ไม่มีรายการแฮชในแฟ้ม Release %s"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "รายการ 'Valid-Until' ไม่ถูกต้องในแฟ้ม Release %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "รายการ 'Date' ไม่ถูกต้องในแฟ้ม Release %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "วรรคที่ %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] แจงไม่ผ่าน)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] สั้นเกินไป)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่ใช่การกำหนดค่า)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่มีคีย์)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] คีย์ %s ไม่มีค่า)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)"
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "กำลังสร้างโครงสร้างลำดับความสัมพันธ์"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "รุ่นแพกเกจที่มี"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "สร้างลำดับความสัมพันธ์"
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "กำลังเปิด %s"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "กำลังอ่านข้อมูลสถานะ"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)"
+msgid "Failed to open StateFile %s"
+msgstr "ไม่สามารถเปิดแฟ้มสถานะ %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
+msgid "Failed to write temporary StateFile %s"
+msgstr "ไม่สามารถเขียนแฟ้มสถานะชั่วคราว %s"
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "ไม่รู้จักชนิด '%s' ที่วรรคที่ %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2935,42 +2910,42 @@ msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'"
msgid "Version '%s' for '%s' was not found"
msgstr "ไม่พบรุ่น '%s' ของ '%s'"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "ไม่พบงานติดตั้ง '%s'"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "ไม่พบแพกเกจที่ตรงกับ glob '%s'"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "ไม่สามารถเลือกรุ่นต่างๆ ของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "ไม่สามารถเลือกรุ่นใหม่ที่สุดของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "ไม่สามารถเลือกรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีรุ่นสำหรับติดตั้ง"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้ของแพกเกจ '%s' ได้ เนื่องจากแพกเกจไม่ได้ติดตั้งไว้"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -2978,169 +2953,59 @@ msgid ""
msgstr ""
"ไม่สามารถเลือกรุ่นที่ติดตั้งไว้หรือรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีทั้งสองอย่าง"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "กำลังติดตั้ง %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "กำลังตั้งค่า %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "กำลังถอดถอน %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "กำลังถอดถอน %s อย่างสมบูรณ์"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "กำลังจดบันทึกการหายไปของ %s"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "กำลังเรียกการสะกิด %s หลังการติดตั้ง"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "ไม่มีไดเรกทอรี '%s'"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "ไม่สามารถเปิดแฟ้ม '%s'"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "กำลังเตรียม %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "กำลังแตกแพกเกจ %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Preparing to configure %s"
-msgstr "กำลังเตรียมตั้งค่า %s"
+msgid "Unable to parse Release file %s"
+msgstr "ไม่สามารถแจงแฟ้ม Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Installed %s"
-msgstr "ติดตั้ง %s แล้ว"
+msgid "No sections in Release file %s"
+msgstr "ไม่มีหัวข้อย่อยในแฟ้ม Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "กำลังเตรียมถอดถอน %s"
+msgid "No Hash entry in Release file %s"
+msgstr "ไม่มีรายการแฮชในแฟ้ม Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Removed %s"
-msgstr "ถอดถอน %s แล้ว"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "รายการ 'Valid-Until' ไม่ถูกต้องในแฟ้ม Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "รายการ 'Date' ไม่ถูกต้องในแฟ้ม Release %s"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Completely removed %s"
-msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
+msgid "%lid %lih %limin %lis"
+msgstr "%liวัน %liชม. %liนาที %liวิ"
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Can not write log (%s)"
-msgstr "ไม่สามารถเขียนปูม (%s)"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr "ได้เมานท์ /dev/pts ไว้หรือไม่?"
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr "stdout เป็นเทอร์มินัลหรือไม่?"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ"
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr "ไม่มีการเขียนรายงาน apport เพราะถึงขีดจำกัด MaxReports แล้ว"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเป็นสิ่งที่ตามมาจากข้อผิดพลาดก่อนหน้า"
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากหน่วยความจำเต็ม"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากปัญหาของระบบในเครื่อง"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากปัญหาการอ่าน/เขียนของ dpkg"
+msgid "%lih %limin %lis"
+msgstr "%liชม. %liนาที %liวิ"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) มีโพรเซสอื่นใช้งานอยู่หรือเปล่า?"
+msgid "%limin %lis"
+msgstr "%liนาที %liวิ"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) คุณเป็น root หรือเปล่า?"
+msgid "%lis"
+msgstr "%liวิ"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรียก '%s' เองเพื่อแก้ปัญหา"
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "ไม่ได้ล็อคอยู่"
+msgid "Selection %s not found"
+msgstr "ไม่พบรายการเลือก %s"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3275,35 +3140,6 @@ msgstr "..."
msgid "%c%s... %u%%"
msgstr "%c%s... %u%%"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%liวัน %liชม. %liนาที %liวิ"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liชม. %liนาที %liวิ"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%liนาที %liวิ"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%liวิ"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "ไม่พบรายการเลือก %s"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "ไม่สามารถ mmap แฟ้มเปล่า"
@@ -3365,107 +3201,266 @@ msgstr "ไม่สามารถ stat จุดเมานท์ %s"
msgid "Failed to stat the cdrom"
msgstr "ไม่สามารถ stat ซีดีรอม"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "พบตัวย่อของชนิดที่ข้อมูลไม่รู้จัก: '%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "ขณะเปิดแฟ้มค่าตั้ง %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "ไวยากรณ์ผิดพลาด %s:%u: เริ่มบล็อคโดยไม่มีชื่อ"
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "ไวยากรณ์ผิดพลาด %s:%u: แท็กผิดรูปแบบ"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังค่า"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "ไวยากรณ์ผิดพลาด %s:%u: ใช้ include ซ้อนกันมากเกินไป"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "ไวยากรณ์ผิดพลาด %s:%u: include จากที่นี่"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "ไวยากรณ์ผิดพลาด %s:%u: พบ directive '%s' ที่ไม่รองรับ"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "ไวยากรณ์ผิดพลาด %s:%u: directive 'clear' ต้องมีอาร์กิวเมนต์เป็นลำดับชั้นตัวเลือก"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังจบแฟ้ม"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "ไม่รู้จักตัวเลือกบรรทัดคำสั่ง '%c' [จาก %s]"
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "ไม่เข้าใจตัวเลือกบรรทัดคำสั่ง %s"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "ตัวเลือกบรรทัดคำสั่ง %s ไม่ได้เป็นค่าบูลีน"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "ตัวเลือก %s ต้องมีอาร์กิวเมนต์"
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "ตัวเลือก %s: การกำหนดรายการค่าตั้งต้องมี =<val>"
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "ตัวเลือก %s ต้องการอาร์กิวเมนต์จำนวนเต็ม ไม่ใช่ '%s'"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "ตัวเลือก '%s' ยาวเกินไป"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "ไม่เข้าใจค่าบูลีน %s กรุณาลองใช้ true หรือ false"
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "ไม่รู้จักคำสั่ง %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "กำลังติดตั้ง %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "กำลังตั้งค่า %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "กำลังถอดถอน %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "กำลังถอดถอน %s อย่างสมบูรณ์"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "กำลังจดบันทึกการหายไปของ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "กำลังเรียกการสะกิด %s หลังการติดตั้ง"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "ไม่มีไดเรกทอรี '%s'"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "ไม่สามารถเปิดแฟ้ม '%s'"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "กำลังเตรียม %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "กำลังแตกแพกเกจ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "กำลังเตรียมตั้งค่า %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "ติดตั้ง %s แล้ว"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "กำลังเตรียมถอดถอน %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "ถอดถอน %s แล้ว"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "กำลังเตรียมถอดถอน %s อย่างสมบูรณ์"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, c-format
+msgid "Can not write log (%s)"
+msgstr "ไม่สามารถเขียนปูม (%s)"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr "ได้เมานท์ /dev/pts ไว้หรือไม่?"
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr "ไม่มีการเขียนรายงาน apport เพราะถึงขีดจำกัด MaxReports แล้ว"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเป็นสิ่งที่ตามมาจากข้อผิดพลาดก่อนหน้า"
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากหน่วยความจำเต็ม"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากปัญหาของระบบในเครื่อง"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากปัญหาการอ่าน/เขียนของ dpkg"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) มีโพรเซสอื่นใช้งานอยู่หรือเปล่า?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) คุณเป็น root หรือเปล่า?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรียก '%s' เองเพื่อแก้ปัญหา"
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "ไม่ได้ล็อคอยู่"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "DropNode ถูกเรียกใช้กับโหนดที่ยังลิงก์อยู่"
@@ -3570,7 +3565,7 @@ msgstr "แฟ้มนี้ไม่ใช่แพกเกจ DEB ที่
msgid "Internal error, could not locate member %s"
msgstr "ข้อผิดพลาดภายใน: ไม่พบสมาชิก %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "ไม่สามารถแจงแฟ้มควบคุมได้"
@@ -3599,23 +3594,23 @@ msgstr "แฟ้มจัดเก็บสั้นเกินไป"
msgid "Failed to read the archive headers"
msgstr "อ่านข้อมูลส่วนหัวของแฟ้มจัดเก็บไม่สำเร็จ"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "สร้างไปป์ไม่สำเร็จ"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "เรียก gzip ไม่สำเร็จ"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "แฟ้มจัดเก็บเสียหาย"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "checksum ของแฟ้ม tar ผิดพลาด แฟ้มจัดเก็บเสียหาย"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "พบชนิด %u ของข้อมูลส่วนหัว TAR ที่ไม่รู้จัก ที่สมาชิก %s"
@@ -3632,6 +3627,9 @@ msgstr "พบชนิด %u ของข้อมูลส่วนหัว T
#~ msgid "No keyring installed in %s."
#~ msgstr "ไม่มีพวงกุญแจติดตั้งไว้ใน %s"
+#~ msgid "Is stdout a terminal?"
+#~ msgstr "stdout เป็นเทอร์มินัลหรือไม่?"
+
#~ msgid "ioctl(TIOCGWINSZ) failed"
#~ msgstr "ioctl(TIOCGWINSZ) ล้มเหลว"
diff --git a/po/tl.po b/po/tl.po
index ca1cc94b3..970b0b387 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2007-03-29 21:36+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -25,148 +25,148 @@ msgstr ""
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:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Kabuuan ng mga Pakete : "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid "Total package structures: "
msgstr "Kabuuan ng mga Pakete : "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Normal na Pakete: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Purong Birtwual na Pakete: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Nag-iisang Birtwal na Pakete: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Halong Birtwal na Pakete: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Kulang/Nawawala: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Kabuuan ng Natatanging mga Bersyon: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
#, fuzzy
msgid "Total distinct descriptions: "
msgstr "Kabuuan ng Natatanging mga Bersyon: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Kabuuan ng mga Dependensiya: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Kabuuan ng ugnayang Ber/Talaksan: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
#, fuzzy
msgid "Total Desc/File relations: "
msgstr "Kabuuan ng ugnayang Ber/Talaksan: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Kabuuan ng Mapping ng Provides: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Kabuuan ng Globbed String: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Kabuuan ng Hindi Nagamit na puwang: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Kabuuan ng puwang na napag-tuosan: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Wala sa sync ang talaksan ng paketeng %s."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Walang nahanap na mga pakete"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
#, fuzzy
msgid "You must give at least one search pattern"
msgstr "Kailangan niyong magbigay ng isa lamang na pattern"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Talaksang Pakete:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
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"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Mga naka-Pin na Pakete:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(hindi nahanap)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Nakaluklok: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Kandidato: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(wala)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Naka-Pin na Pakete: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Talaang Bersyon:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, 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:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -242,21 +242,21 @@ msgstr ""
"Basahin ang pahina ng manwal ng apt-cache(8) at apt.conf(5) para sa \n"
"karagdagang impormasyon\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Bigyan ng pangalan ang Disk na ito, tulad ng 'Debian 2.1r1 Disk 1'"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Paki-pasok ang isang Disk sa drive at pindutin ang enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -264,7 +264,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Ulitin ang prosesong ito para sa lahat ng mga CD sa inyong set."
@@ -300,83 +300,78 @@ msgstr ""
" -c=? Basahin itong talaksang pagkaayos\n"
" -o=? Itakda ang isang option sa pagkaayos, hal. -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ngunit ang %s ay iluluklok"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "ngunit ang %s ay iluluklok"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Error na internal, may nasira ang problem resolver"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Hindi maaldaba ang directory ng talaan"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Hindi maaldaba ang directory ng download"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
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:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Hindi mahanap ang paketeng source para sa %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -384,94 +379,94 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Kunin ang Source %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Bigo sa pagkuha ng ilang mga arkibo."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, 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:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, 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:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Utos na build '%s' ay bigo.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Bigo ang prosesong anak"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
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:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Bigo sa pagproseso ng build dependencies"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, 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:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "Walang build depends ang %s.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -480,7 +475,7 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -489,14 +484,14 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, 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:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -505,7 +500,7 @@ 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:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -514,17 +509,17 @@ msgstr ""
"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
"mahanap"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, 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:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Hindi mabuo ang build-dependencies para sa %s."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Bigo sa pagproseso ng build dependencies"
@@ -631,11 +626,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -649,52 +644,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "ngunit ito ay hindi nakaluklok"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "ngunit ang %s ay iluluklok"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "ngunit ang %s ay iluluklok"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s ay pinakabagong bersyon na.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s ay pinakabagong bersyon na.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Naghintay, para sa %s ngunit wala nito doon"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "ngunit ang %s ay iluluklok"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "Bigo ang pagbukas ng %s"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -915,7 +911,7 @@ msgstr "Nag-timeout ang socket ng datos"
msgid "Unable to accept connection"
msgstr "Hindi makatanggap ng koneksyon"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Problema sa pag-hash ng talaksan"
@@ -1004,40 +1000,40 @@ msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Hindi maka-konekta sa %s %s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
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:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
+#, fuzzy
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
-"Hindi maitakbo ang 'apt-key' upang maberipika ang lagda (nakaluklok ba ang "
-"gnupg?)"
+"Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gnupg?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Hindi kilalang error sa pag-execute ng apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Ang sumusunod na mga lagda ay imbalido:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1049,31 +1045,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Error sa pagsusulat sa talaksan"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Error sa pagbasa mula sa server"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Error sa pagsulat sa talaksan"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Bigo ang pagpili"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Nag-timeout ang koneksyon"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Error sa pagsulat ng talaksang output"
@@ -1081,53 +1077,294 @@ msgstr "Error sa pagsulat ng talaksang output"
msgid "Waiting for headers"
msgstr "Naghihintay ng panimula"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Maling linyang panimula"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "Nagpadala ang HTTP server ng di tanggap na reply header"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Sira ang range support ng HTTP server na ito"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Di kilalang anyo ng petsa"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Maling datos sa panimula"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Bigo ang koneksyon"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Internal na error"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Inaayos ang mga dependensiya..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " ay bigo."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Hindi maayos ang mga dependensiya"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Hindi mai-minimize ang upgrade set"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Tapos"
+
+#: apt-private/private-cachefile.cc:110
+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."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Nakaluklok]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Nakaluklok]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Nakaluklok]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Nakaluklok]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "ngunit ang %s ay nakaluklok"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ngunit ang %s ay iluluklok"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "ngunit hindi ito maaaring iluklok"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "ngunit ito ay birtwal na pakete"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "ngunit ito ay hindi nakaluklok"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "ngunit ito ay hindi iluluklok"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " o"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Ang susunod na mga pakete ay iu-upgrade:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (dahil sa %s) "
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n"
+"HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu iniluklok muli, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu nai-downgrade, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[O/h]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[o/H]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "O"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "H"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Error sa pag-compile ng regex - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1385,247 +1622,6 @@ msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Inaayos ang mga dependensiya..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " ay bigo."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Hindi maayos ang mga dependensiya"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Hindi mai-minimize ang upgrade set"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Tapos"
-
-#: apt-private/private-cachefile.cc:110
-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."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "May mga kulang na dependensiya. Subukan niyong gamitin ang -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Nakaluklok]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Nakaluklok]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Nakaluklok]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Nakaluklok]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "ngunit ang %s ay nakaluklok"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ngunit ang %s ay iluluklok"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "ngunit hindi ito maaaring iluklok"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "ngunit ito ay birtwal na pakete"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "ngunit ito ay hindi nakaluklok"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "ngunit ito ay hindi iluluklok"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " o"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Ang sumusunod na mga pakete ay may kulang na dependensiya:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Ang sumusunod na mga pakete ay TATANGGALIN:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Ang sumusunod na mga pakete ay hinayaang maiwanan:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Ang susunod na mga pakete ay iu-upgrade:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Ang susunod na mga pakete ay ida-DOWNGRADE:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Ang susunod na mga hinawakang mga pakete ay babaguhin:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (dahil sa %s) "
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"BABALA: Ang susunod na mga paketeng esensyal ay tatanggalin.\n"
-"HINDI ito dapat gawin kung hindi niyo alam ng husto ang inyong ginagawa!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu iniluklok muli, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu nai-downgrade, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu na tatanggalin at %lu na hindi inupgrade\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[O/h]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[o/H]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "O"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "H"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Error sa pag-compile ng regex - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1681,20 +1677,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Tumama "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Tumama:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Kunin: "
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Kunin:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "DiPansin "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "DiPansin:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Err "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Err:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1720,17 +1720,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Hindi mabasa ang %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1807,7 +1807,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Pinagsasama ang magagamit na impormasyon"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1831,46 +1831,46 @@ 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:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Hindi ma-stat ang %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Hindi makapagsulat sa %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Hindi makuha ang bersyon ng debconf. Nakaluklok ba ang debconf?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Mahaba masyado ang talaan ng extensyon ng mga pakete"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Error sa pagproseso ng directory %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Mahaba masyado ang talaan ng extensyon ng pagkukunan (source)"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Error sa pagsulat ng panimula sa talaksang nilalaman (contents)"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Error sa pagproseso ng Contents %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1955,11 +1955,11 @@ msgstr ""
" -c=? Basahin itong talaksang pagkaayos\n"
" -o=? Itakda ang isang option na pagkaayos"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Walang mga pinili na tugma"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "May mga talaksang kulang sa grupo ng talaksang pakete `%s'"
@@ -2072,22 +2072,22 @@ msgstr " DeLink limit na %sB tinamaan.\n"
msgid "Archive had no package field"
msgstr "Walang field ng pakete ang arkibo"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s ay walang override entry\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Tagapangalaga ng %s ay %s hindi %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s ay walang override entry para sa pinagmulan\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s ay wala ring override entry na binary\n"
@@ -2173,7 +2173,7 @@ msgstr "Problema sa pag-unlink ng %s"
msgid "Failed to rename %s to %s"
msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2198,11 +2198,11 @@ msgstr ""
" -c=? Basahin ang talaksang pagkaayos na ito\n"
" -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Di kilalang record ng pakete!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2277,6 +2277,27 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Di tugmang MD5Sum"
+#: apt-pkg/acquire-worker.cc:133
+#, 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:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Hindi umandar ng tama ang paraang %s"
+
+#: apt-pkg/acquire-worker.cc:485
+#, 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/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr ""
@@ -2292,179 +2313,301 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Walang laman ang cache ng pakete"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Sira ang talaksan ng cache ng pakete"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
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:163
+#: apt-pkg/pkgcache.cc:168
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "Sira ang talaksan ng cache ng pakete"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, 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:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Ang cache ng pakete ay binuo para sa ibang arkitektura"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Dependensiya"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "PreDepends"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Mungkahi"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Rekomendado"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Tunggali"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Pumapalit"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Linalaos"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "importante"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "kailangan"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "standard"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "optional"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "extra"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Sinusuri ang pag-upgrade"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Ang driver ng paraang %s ay hindi mahanap."
+msgid "Index file type '%s' is not supported"
+msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
+
+#: apt-pkg/sourcelist.cc:206
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Hindi umandar ng tama ang paraang %s"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:208
#, 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."
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
+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/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Ginagawa ang puno ng mga dependensiya"
+#: apt-pkg/sourcelist.cc:217
+#, 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/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Bersyong Kandidato"
+#: apt-pkg/sourcelist.cc:224
+#, 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/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Pagbuo ng Dependensiya"
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Binubuksan %s"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "Pinagsasama ang magagamit na impormasyon"
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, 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:371
+#, 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:375
+#, 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/depcache.cc:250
+#: apt-pkg/sourcelist.cc:416
#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Bigo ang pagbukas ng %s"
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Bigo sa pagsulat ng talaksang %s"
+msgid "Clean of %s is not supported"
+msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Hindi ma-stat ang %s"
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Hindi akma ang versioning system ng cache"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:273
+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:276
+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:279
+#, 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:282
+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:591
+#, 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:1196
+#, 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:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Binabasa ang Listahan ng mga Pakete"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Kinukuha ang Talaksang Provides"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "IO Error sa pag-imbak ng source cache"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Di tugmang laki"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Di tanggap na operasyon %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Error sa pagsulat"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2472,7 +2615,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
@@ -2488,49 +2631,49 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "Walang public key na magamit para sa sumusunod na key ID:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2539,12 +2682,12 @@ 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:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2552,116 +2695,42 @@ msgstr ""
"Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
"paketeng %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Hindi akma ang versioning system ng cache"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:273
-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:276
-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:279
-#, 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:282
-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:591
-#, 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:1203
-#, 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:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Binabasa ang Listahan ng mga Pakete"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Kinukuha ang Talaksang Provides"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "IO Error sa pag-imbak ng source cache"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Block ng nagbebenta %s ay walang fingerprint"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Nawawala ang directory ng talaan %spartial."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Nawawala ang directory ng arkibo %spartial."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Hindi suportado ang uri ng talaksang index na '%s'"
+msgid "Unable to lock directory %s"
+msgstr "Hindi maaldaba ang directory ng talaan"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Kinukuha ang talaksang %li ng %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-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/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Kailangan niyong maglagay ng 'source' URIs sa inyong sources.list"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Hindi ma-stat ang %s"
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2683,19 +2752,19 @@ msgstr "Hindi naintindihan ang uri ng pin %s"
msgid "No priority (or zero) specified for pin"
msgstr "Walang prioridad (o sero) na nakatakda para sa pin"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "Hindi mabuksan ang talaksang %s"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2707,10 +2776,14 @@ msgstr ""
"loop. Madalas ay masama ito, ngunit kung nais niyo talagang gawin ito, i-"
"activate ang APT::Force-LoopBreak na option."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+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/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2779,11 +2852,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Kinokopya ang Listahan ng mga Pakete"
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Sinusulat ang bagong listahan ng pagkukunan\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Mga nakatala sa Listahan ng Source para sa Disc na ito ay:\n"
@@ -2795,7 +2868,7 @@ msgstr ""
"Kailangan ma-instol muli ang paketeng %s, ngunit hindi ko mahanap ang arkibo "
"para dito."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2803,140 +2876,42 @@ msgstr ""
"Error, pkgProblemResolver::Resolve ay naghudyat ng mga break, maaaring dulot "
"ito ng mga paketeng naka-hold."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
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/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-
-#: apt-pkg/indexrecords.cc:91
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Paunawa, pinili ang %s imbes na %s\n"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:152
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Di tanggap na linya sa talaksang diversion: %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Ginagawa ang puno ng mga dependensiya"
-#: apt-pkg/sourcelist.cc:170
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Bersyong Kandidato"
-#: apt-pkg/sourcelist.cc:173
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Pagbuo ng Dependensiya"
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Pinagsasama ang magagamit na impormasyon"
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/depcache.cc:252
#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
+msgid "Failed to open StateFile %s"
+msgstr "Bigo ang pagbukas ng %s"
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:258
#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
-
-#: apt-pkg/sourcelist.cc:206
-#, 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:208
-#, 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:211
-#, 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:217
-#, 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:224
-#, 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:335
-#, c-format
-msgid "Opening %s"
-msgstr "Binubuksan %s"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Bigo sa pagsulat ng talaksang %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, 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:375
-#, 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:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Hindi ma-parse ang talaksang pakete %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2948,208 +2923,101 @@ msgstr "Release '%s' para sa '%s' ay hindi nahanap"
msgid "Version '%s' for '%s' was not found"
msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Hindi mahanap ang paketeng %s"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Hindi mahanap ang paketeng %s"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Hindi mahanap ang paketeng %s"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
+#: apt-pkg/indexrecords.cc:83
#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "Iniluklok ang %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Isasaayos ang %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Tinatanggal ang %s"
+msgid "Unable to parse Release file %s"
+msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/indexrecords.cc:91
#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Natanggal ng lubusan ang %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "No sections in Release file %s"
+msgstr "Paunawa, pinili ang %s imbes na %s\n"
-#: apt-pkg/deb/dpkgpm.cc:112
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Running post-installation trigger %s"
+msgid "No Hash entry in Release file %s"
msgstr ""
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
+#: apt-pkg/indexrecords.cc:145
#, fuzzy, c-format
-msgid "Directory '%s' missing"
-msgstr "Nawawala ang directory ng talaan %spartial."
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Di tanggap na linya sa talaksang diversion: %s"
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/indexrecords.cc:164
#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Hindi mabuksan ang talaksang %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Hinahanda ang %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "Binubuklat ang %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "Hinahanda ang %s upang isaayos"
-
-#: apt-pkg/deb/dpkgpm.cc:1012
-#, c-format
-msgid "Installed %s"
-msgstr "Iniluklok ang %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1017
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Naghahanda para sa pagtanggal ng %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, c-format
-msgid "Removed %s"
-msgstr "Tinanggal ang %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Completely removed %s"
-msgstr "Natanggal ng lubusan ang %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Hindi makapagsulat sa %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
+#, c-format
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Hindi maaldaba ang directory ng talaan"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "%lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
+msgstr "Piniling %s ay hindi nahanap"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3287,35 +3155,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Tapos"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Piniling %s ay hindi nahanap"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Hindi mai-mmap ang talaksang walang laman"
@@ -3378,111 +3217,267 @@ msgstr "Di mai-stat ang mount point %s"
msgid "Failed to stat the cdrom"
msgstr "Bigo sa pag-stat ng cdrom"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Hindi kilalang katagang uri: '%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Binubuksan ang talaksang pagsasaayos %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, 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:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Syntax error %s:%u: Maling anyo ng Tag"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, 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:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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:881
+#: apt-pkg/contrib/configuration.cc:887
#, 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:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Syntax error %s:%u: Sinama mula dito"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, fuzzy, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Syntax error %s:%u: Maaari lamang gawin ang mga direktiba sa tuktok na antas"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, 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/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, 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:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Opsyon sa command line %s ay di naintindihan."
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Opsyon sa command line %s ay hindi boolean"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Opsyon %s ay nangangailangan ng argumento"
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
"Opsyon %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng "
"=<halaga>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, 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:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Opsyon '%s' ay labis ang haba"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, 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:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Di tanggap na operasyon %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "Iniluklok ang %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Isasaayos ang %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Tinatanggal ang %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Natanggal ng lubusan ang %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Nawawala ang directory ng talaan %spartial."
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Hindi mabuksan ang talaksang %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Hinahanda ang %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Binubuklat ang %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Hinahanda ang %s upang isaayos"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "Iniluklok ang %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Naghahanda para sa pagtanggal ng %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "Tinanggal ang %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Naghahanda upang tanggalin ng lubusan ang %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "Natanggal ng lubusan ang %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Hindi makapagsulat sa %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Hindi maaldaba ang directory ng talaan"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "Tinawagan ang DropNode sa naka-link pa na node"
@@ -3587,7 +3582,7 @@ msgstr "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s'"
msgid "Internal error, could not locate member %s"
msgstr "Internal error, hindi mahanap ang miyembrong %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Di maintindihang talaksang control"
@@ -3616,23 +3611,23 @@ msgstr "Bitin ang arkibo. Sobrang iksi."
msgid "Failed to read the archive headers"
msgstr "Bigo ang pagbasa ng header ng arkibo"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Bigo sa paglikha ng mga pipe"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Bigo sa pagtakbo ng gzip "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Sirang arkibo"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Bigo ang checksum ng tar, sira ang arkibo"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Hindi kilalang uri ng TAR header %u, miyembrong %s"
diff --git a/po/tr.po b/po/tr.po
index fb50d6089..1e6f38903 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2014-09-29 22:08+0200\n"
"Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
"Language-Team: Debian l10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -25,146 +25,146 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "%s paketinin (sürüm %s) karşılanamayan bir bağımlılığı var:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Toplam paketlerin adları: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Toplam paket yapıları: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Normal paketler: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Saf sanal paketler: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Tekil sanal paketler: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Karışık sanal paketler: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Eksik: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Toplam farklı sürümler: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Toplam farklı açıklamalar: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Toplam bağımlılıklar: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Toplam sürüm/dosya ilişkileri: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Toplam Tanım/Dosya ilişkileri: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Toplam destekleme eşleştirmeleri: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Toplam birikmiş dizgiler: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Toplam serbest alan: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Hesaplanan toplam alan: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "%s paket dosyası eşzamansız."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Hiç paket bulunamadı"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "En az bir arama örüntüsü vermelisiniz"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
"Bu komutun kullanımı bırakılmıştır. Lütfen bunun yerine 'apt-mark showauto' "
"komutunu kullanın."
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "%s paketi bulunamadı"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Paket dosyaları:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "Önbellek eşzamanlı değil, paket dosyası 'x-ref' yapılamıyor"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Sabitlenmiş paketler:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(bulunamadı)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Kurulu: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Aday: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(hiçbiri)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Paket sabitleme: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Sürüm çizelgesi:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s (%s için) %s %s tarihinde derlendi\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -236,20 +236,20 @@ msgstr ""
"Ayrıntılı bilgi için apt-cache(8) ve apt.conf(5) rehber sayfalarına göz "
"atın.\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Lütfen bu CD/DVD'ye bir ad verin, örneğin 'Debian 5.0.3 Disk 1'"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Lütfen sürücüye bir Disk yerleştirin ve giriş tuşuna (Enter) basın"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "'%s', '%s' konumuna bağlanamadı"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -262,7 +262,7 @@ msgstr ""
"Otomatik CD-ROM ve bağlantı noktası algılama hakkında daha fazla bilgi almak "
"için 'man apt-cdrom' komutunu kullanabilirsiniz."
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Kalan CD'leriniz için bu işlemi yineleyin."
@@ -299,48 +299,48 @@ msgstr ""
" -o=? İsteğe bağlı ayar seçeneği belirtmenizi sağlar, örneğin -o dir::"
"cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "'%s' mimarisi için bir paket bulunamadı"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "'%s' paketinin '%s' sürümü bulunamadı"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "'%s' paketi '%s' dağıtım sürümünde bulunamadı"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Kaynak paket olarak '%s' yerine '%s' kullanılacak\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "'%2$s' paketinin '%1$s' sürümünü bulunamadı"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "%s paketi bulunamadı"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s elle kurulmuş olarak ayarlandı.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s otomatik olarak kurulmuş şekilde ayarlandı.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -348,29 +348,24 @@ msgstr ""
"Bu komut artık kullanılmamaktadır. Bunun yerine 'apt-mark auto' ve 'apt-mark "
"manual' kullanın."
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "İç hata, sorun çözücü nesneyi bozdu"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "%s dizini kilitlenemiyor"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "İndirme dizini kilitlenemiyor"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "Kaynağının indirileceği en az bir paket seçilmeli"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "%s paketinin kaynak paketi bulunamadı"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -380,7 +375,7 @@ msgstr ""
"yapılmaktadır:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -392,67 +387,67 @@ msgstr ""
"bzr branch %s\n"
"komutunu kullanın.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Zaten indirilmiş olan '%s' dosyası atlanıyor\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB kaynak arşivi indirilecek.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB kaynak arşivi indirilecek.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "%s kaynağını al\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Bazı arşivler alınamadı."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "İndirme işlemi tamamlandı ve sadece indirme kipinde"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "%s için zaten açılmış bazı paketlerin açılması atlanıyor\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Paket açma komutu '%s' başarısız.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "'dpkg-dev' paketinin kurulu olduğundan emin olun.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "İnşa komutu '%s' başarısız oldu.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Alt süreç başarısız"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr "İnşa bağımlılıklarının denetleneceği en az bir paket belirtilmelidir"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -461,27 +456,27 @@ msgstr ""
"%s mimarisine uygun mimari bilgileri mevcut değil. Kurulumu için apt.conf(5) "
"rehber sayfasındaki APT::Architectures kısmına göz atın"
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "İnşa bağımlılıklarını işleme başarısız oldu"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s paketinin inşa-bağımlılığı bilgisi alınamıyor"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s paketinin hiç inşa bağımlılığı yok.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -490,7 +485,7 @@ msgstr ""
"'%4$s' paketlerinde %3$s paketine izin verilmediği için %2$s kaynağının %1$s "
"bağımlılığı karşılanamıyor"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -498,12 +493,12 @@ msgid ""
msgstr ""
"%2$s için %1$s bağımlılığı, %3$s paketi bulunamadığı için karşılanamadı"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr "%2$s için %1$s bağımlılığı karşılanamadı: Kurulu %3$s paketi çok yeni"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -512,7 +507,7 @@ msgstr ""
"%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü "
"gerekli sürüm şartlarını karşılamıyor"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -520,17 +515,17 @@ msgid ""
msgstr ""
"%2$s için %1$s bağımlılığı sağlanamıyor, çünkü %3$s paketinin aday sürümü yok"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "%2$s için %1$s bağımlılığı karşılanamadı: %3$s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s için inşa bağımlılıkları karşılanamadı."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "İnşa bağımlılıklarını işleme başarısız oldu"
@@ -641,11 +636,11 @@ msgstr "Argüman olarak bir adet URL'ye ihtiyaç vardır"
msgid "Must specify at least one pair url/filename"
msgstr "En az bir adet url/dosya-adı çifti belirtilmelidir"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr "İndirme Başarısız"
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -669,52 +664,53 @@ msgstr ""
"\n"
" Bu APT yardımcısının Süper Meep Güçleri var.\n"
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "%s kurulu olmadığı için işaretlenemedi.\n"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s zaten elle kurulmuş olarak ayarlı.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s zaten otomatik kurulmuş olarak ayarlı.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr "%s zaten tutulacak şekilde ayarlanmış.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr "%s zaten tutulmayacak şekilde ayarlanmış.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "%s için beklenildi ama o gelmedi"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr "%s paketi tutuluyor.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "%s paketini tutma işlemi iptal edildi.\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr "'dpkg' çalıştırılamadı. root olduğunuzdan emin misiniz?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -977,7 +973,7 @@ msgstr "Veri soketi bağlantısı zaman aşımına uğradı"
msgid "Unable to accept connection"
msgstr "Bağlantı kabul edilemiyor"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Dosya sağlaması yapılamadı"
@@ -1066,21 +1062,21 @@ msgstr "'%s:%s' (%i - %s) adresi çözümlenirken bir şeyler kötü gitti"
msgid "Unable to connect to %s:%s:"
msgstr "Bağlanılamadı %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "İç hata: İmza iyi, ancak anahtar parmak izi belirlenemedi?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "En az bir geçersiz imza ile karşılaşıldı."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr "İmza doğrulama için 'apt-key' çalıştırılamadı (gnupg kurulu mu?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1089,15 +1085,15 @@ msgstr ""
"Temiz-imzalı dosya geçerli değil, '%s' hatası alındı (ağ kimlik doğrulama "
"gerektiriyor mu?)"
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "apt-key çalıştırılırken bilinmeyen hata"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Aşağıdaki imzalar geçersiz:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1107,31 +1103,31 @@ msgstr "Aşağıdaki imzalar doğrulanamadı, çünkü genel anahtar mevcut değ
msgid "Empty files can't be valid archives"
msgstr "Boş dosyalar geçerli birer arşiv dosyası olamazlar"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Dosyaya yazılamadı"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Sunucundan okunurken hata. Uzak sonlu kapalı bağlantı"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Sunucundan okunurken hata"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Dosyaya yazılamadı"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Seçme başarısız"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Bağlantı zaman aşımına uğradı"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Çıktı dosyasına yazılırken hata"
@@ -1139,53 +1135,305 @@ msgstr "Çıktı dosyasına yazılırken hata"
msgid "Waiting for headers"
msgstr "Başlıklar bekleniyor"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Kötü başlık satırı"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP sunucusu geçersiz bir cevap başlığı gönderdi"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP sunucusu geçersiz bir Content-Length başlığı gönderdi"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP sunucusu geçersiz bir Content-Range başlığı gönderdi"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "HTTP sunucusunun aralık desteği bozuk"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Bilinmeyen tarih biçimi"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Kötü başlık verisi"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Bağlantı başarısız"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "İç hata"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Listeleme"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "Fazladan %i sürüm daha var. Görmek için '-a' anahtarını kullanın."
+msgstr[1] ""
+"Fazladan %i sürüm daha var. Bu sürümleri görmek için '-a' anahtarını "
+"kullanın."
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Bağımlılıklar düzeltiliyor..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " başarısız oldu."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Bağımlılıklar düzeltilemedi"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Yükseltme kümesi küçültülemiyor"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Tamamlandı"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Bu sorunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız "
+"gerekebilir."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Karşılanmayan bağımlılıklar. -f kullanmayı deneyin."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "bilinmeyen"
+
+#: apt-private/private-output.cc:265
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[kurulu,yükseltilebilir: %s]"
+
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr "[kurulu,yerel]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[kurulu,otomatik-kaldırılabilir]"
+
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr "[kurulu,otomatik]"
+
+#: apt-private/private-output.cc:274
+msgid "[installed]"
+msgstr "[kurulu]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[şundan yükseltilebilir: %s]"
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr "[artık-yapılandırma]"
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "ama %s kurulu"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ama %s kurulacak"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "ama kurulabilir değil"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "ama o bir sanal paket"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "ama kurulu değil"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "ama kurulmayacak"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " ya da"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Aşağıdaki YENİ paketler kurulacak:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Aşağıdaki paketler KALDIRILACAK:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Aşağıdaki paketler yükseltilecek:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (%s nedeniyle) "
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"UYARI: Aşağıdaki temel paketler kaldırılacak.\n"
+"Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu paket yeniden kurulacak, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu paketin sürümü düşürülecek, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[E/h]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[e/H]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "E"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "H"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex derleme hatası - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "'update' komutu argüman almaz"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"%i paket yükseltilebilir. Bu paketi görmek için 'apt list --upgradable' "
+"komutunu çalıştırın.\n"
+msgstr[1] ""
+"%i paket yükseltilebilir. Bu paketleri görmek için 'apt list --upgradable' "
+"komutunu çalıştırın.\n"
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr "Tüm paketler güncel."
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "Sıralama"
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "Fazladan %i kayıt daha var. Görmek için '-a' anahtarını kullanın."
+msgstr[1] ""
+"Fazladan %i kayıt daha var. Bu kayıtları görmek için '-a' anahtarını "
+"kullanın. kullanabilirsiniz."
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "gerçek bir paket değil (sanal)"
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"NOT: Bu sadece bir benzetimdir!\n"
+" apt-get'i gerçekten çalıştırmak için root haklarına ihtiyaç vardır.\n"
+" Unutmayın ki benzetim kipinde kilitleme yapılmaz, bu nedenle\n"
+" bu benzetimin gerçekteki durumla birebir aynı olacağına güvenmeyin!"
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "İç hata, InstallPackages bozuk paketler ile çağrıldı!"
@@ -1452,258 +1700,6 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr "'%s' kurulu değildi, dolayısıyla kaldırılmadı\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "Listeleme"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] "Fazladan %i sürüm daha var. Görmek için '-a' anahtarını kullanın."
-msgstr[1] ""
-"Fazladan %i sürüm daha var. Bu sürümleri görmek için '-a' anahtarını "
-"kullanın."
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Bağımlılıklar düzeltiliyor..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " başarısız oldu."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Bağımlılıklar düzeltilemedi"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Yükseltme kümesi küçültülemiyor"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Tamamlandı"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Bu sorunları düzeltmek için 'apt-get -f install' komutunu çalıştırmanız "
-"gerekebilir."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Karşılanmayan bağımlılıklar. -f kullanmayı deneyin."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "bilinmeyen"
-
-#: apt-private/private-output.cc:265
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[kurulu,yükseltilebilir: %s]"
-
-#: apt-private/private-output.cc:268
-msgid "[installed,local]"
-msgstr "[kurulu,yerel]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr "[kurulu,otomatik-kaldırılabilir]"
-
-#: apt-private/private-output.cc:272
-msgid "[installed,automatic]"
-msgstr "[kurulu,otomatik]"
-
-#: apt-private/private-output.cc:274
-msgid "[installed]"
-msgstr "[kurulu]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[şundan yükseltilebilir: %s]"
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr "[artık-yapılandırma]"
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "ama %s kurulu"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ama %s kurulacak"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "ama kurulabilir değil"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "ama o bir sanal paket"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "ama kurulu değil"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "ama kurulmayacak"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " ya da"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Aşağıdaki paketler karşılanmamış bağımlılıklara sahip:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Aşağıdaki YENİ paketler kurulacak:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Aşağıdaki paketler KALDIRILACAK:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Aşağıdaki paketlerin mevcut durumları korunacak:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Aşağıdaki paketler yükseltilecek:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Aşağıdaki paketlerin SÜRÜMLERİ DÜŞÜRÜLECEK:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Aşağıdaki eski sürümlerinde tutulan paketler değiştirilecek:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (%s nedeniyle) "
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"UYARI: Aşağıdaki temel paketler kaldırılacak.\n"
-"Bu işlem ne yaptığınızı tam olarak bilmediğiniz takdirde YAPILMAMALIDIR!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu paket yükseltilecek, %lu yeni paket kurulacak, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu paket yeniden kurulacak, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu paketin sürümü düşürülecek, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu paket kaldırılacak ve %lu paket yükseltilmeyecek.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu paket tam olarak kurulmayacak ya da kaldırılmayacak.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[E/h]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[e/H]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "E"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "H"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex derleme hatası - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "'update' komutu argüman almaz"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"%i paket yükseltilebilir. Bu paketi görmek için 'apt list --upgradable' "
-"komutunu çalıştırın.\n"
-msgstr[1] ""
-"%i paket yükseltilebilir. Bu paketleri görmek için 'apt list --upgradable' "
-"komutunu çalıştırın.\n"
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr "Tüm paketler güncel."
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] "Fazladan %i kayıt daha var. Görmek için '-a' anahtarını kullanın."
-msgstr[1] ""
-"Fazladan %i kayıt daha var. Bu kayıtları görmek için '-a' anahtarını "
-"kullanın. kullanabilirsiniz."
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "gerçek bir paket değil (sanal)"
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"NOT: Bu sadece bir benzetimdir!\n"
-" apt-get'i gerçekten çalıştırmak için root haklarına ihtiyaç vardır.\n"
-" Unutmayın ki benzetim kipinde kilitleme yapılmaz, bu nedenle\n"
-" bu benzetimin gerçekteki durumla birebir aynı olacağına güvenmeyin!"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1757,20 +1753,24 @@ msgid "Full Text Search"
msgstr "Tam Metin Arama"
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Bağlandı "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Bağlandı:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Alınıyor: "
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Alınıyor:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Yoksay "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Yoksay:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Hata "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Hata:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1796,17 +1796,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "%s okunamıyor"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1883,7 +1883,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Kullanılabilir bilgiler birleştiriliyor"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1907,46 +1907,46 @@ msgstr ""
" -c=? Belirtilen ayar dosyasını kullanır\n"
" -o=? Ayar seçeneği belirtmeyi sağlar, ör -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, c-format
msgid "Unable to mkstemp %s"
msgstr "mkstemp %s başarısız oldu"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "%s dosyasına yazılamıyor"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "debconf sürümü alınamıyor. debconf kurulu mu?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Paket uzantı listesi çok uzun"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "%s dizinini işlemede hata"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Kaynak uzantı listesi çok uzun"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "İçindekiler dosyasına başlık yazmada hata"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "%s içeriğini işlemede hata"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -2029,11 +2029,11 @@ msgstr ""
" -c=? Belirtilen yapılandırma dosyası kullan\n"
" -o=? Yapılandırma seçeneği ayarla"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Hiçbir seçim eşleşmedi"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "'%s' paket dosyası grubunda bazı dosyalar eksik"
@@ -2144,22 +2144,22 @@ msgstr " %sB'lik bağ koparma (DeLink) sınırına ulaşıldı.\n"
msgid "Archive had no package field"
msgstr "Arşivde paket alanı yok"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s için geçersiz kılma girdisi yok\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s geliştiricisi %s, %s değil\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " '%s' paketinin yerine geçecek bir kaynak paket yok\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " '%s' paketinin yerine geçecek bir ikili paket de yok\n"
@@ -2245,7 +2245,7 @@ msgstr "%s bağı koparılırken sorun çıktı"
msgid "Failed to rename %s to %s"
msgstr "%s, %s olarak yeniden adlandırılamadı"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2270,11 +2270,11 @@ msgstr ""
" -c=? Belirtilen yapılandırma dosyası kullan\n"
" -o=? Yapılandırma seçeneği ayarla, örneğin -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Bilinmeyen paket kaydı!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2347,6 +2347,28 @@ msgstr "%s için kimlik doğrulama kaydı bulunamadı"
msgid "Hash mismatch for: %s"
msgstr "Sağlama yapılamadı: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Yöntem sürücüsü %s bulunamadı."
+
+#: apt-pkg/acquire-worker.cc:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "%s paketi kurulu mu?"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "%s yöntemi düzgün şekilde başlamadı"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Lütfen '%s' olarak etiketlenmiş diski '%s' sürücüsüne yerleştirin ve giriş "
+"(enter) tuşuna basın."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "Paket listeleri ya da durum dosyası ayrıştırılamadı ya da açılamadı."
@@ -2359,178 +2381,308 @@ msgstr "Bu sorunları gidermek için apt-get update komutunu çalıştırabilirs
msgid "The list of sources could not be read."
msgstr "Kaynak listesi okunamadı."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Paket önbelleği boş"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Paket önbelleği dosyası bozulmuş"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Paket önbelleği dosyası uyumsuz bir sürümde"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr "Paket önbellek dosyası bozulmuş, çok küçük"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Bu APT '%s' sürümleme sistemini desteklemiyor"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Paket önbelleği farklı bir mimarı için yapılmış"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Bağımlılıklar"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "ÖnBağımlılıklar"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Önerdikleri"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Tavsiye ettikleri"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Çakışmalar"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Değiştirilenler"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Eskiyenler"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Bozdukları"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Geliştirdikleri"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "önemli"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "gerekli"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "standart"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "seçimlik"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "ilave"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
-#, fuzzy
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
-msgstr "Yükseltme hesaplanıyor... "
+msgstr "Yükseltme hesaplanıyor"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Yöntem sürücüsü %s bulunamadı."
+msgid "Index file type '%s' is not supported"
+msgstr "İndeks dosyası türü '%s' desteklenmiyor"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, c-format
-msgid "Is the package %s installed?"
-msgstr "%s paketi kurulu mu?"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr ""
+"Kaynak listesinin (%2$s) %1$u numaralı girdisi hatalı (URI ayrıştırma)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "%s yöntemi düzgün şekilde başlamadı"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] "
+"ayrıştırılamıyor)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-"Lütfen '%s' olarak etiketlenmiş diski '%s' sürücüsüne yerleştirin ve giriş "
-"(enter) tuşuna basın."
+"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] çok kısa)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "İndeks dosyası türü '%s' desteklenmiyor"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] bir atama "
+"değil)"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Bağımlılık ağacı oluşturuluyor"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] seçeneğinin "
+"anahtarı yok)"
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Aday sürümler"
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] %4$s "
+"anahtarına değer atanmamış)"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Bağımlılık oluşturma"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Durum bilgisi okunuyor"
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dist)"
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Durum dosyası (StateFile) %s açılamadı"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr ""
+"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:217
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Geçici durum dosyasına (%s) yazma başarısız oldu"
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (mutlak dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dağıtım ayrıştırma)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "%s Açılıyor"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı çok uzun."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)"
+
+#: apt-pkg/sourcelist.cc:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "'%s' türü bilinmiyor (girdi: %u, kaynak listesi: %s)"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr "%s temizliği desteklenmiyor"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "%s için dosya bilgisi alınamadı."
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Önbelleğin uyumsuz bir sürümleme sistemi var"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "%s paketi işlenirken sorunlarla karşılaşıldı (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Vay canına, bu APT'nin alabileceği paket adları sayısını aştınız."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Vay canına, bu APT'nin alabileceği sürüm sayısını aştınız."
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Vay canına, bu APT'nin alabileceği açıklama sayısını aştınız."
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Vay canına, bu APT'nin alabileceği bağımlılık sayısını aştınız."
+
+#: apt-pkg/pkgcachegen.cc:591
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Dosya bağımlılıkları işlenirken %s %s paketi bulunamadı"
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Kaynak listesinin (%s) dosya bilgisi alınamadı"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Paket listeleri okunuyor"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Dosya Sağlananları Toplanıyor"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Kaynak önbelleği kaydedilirken GÇ Hatası"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Çözücüye senaryo gönder"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Çözücüye istek gönder"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Çözüm almak için hazırlan"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "Harici çözücü düzgün bir hata iletisi göstermeden başarısız oldu"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "Harici çözücüyü çalıştır"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "yeniden adlandırma başarısız, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Sağlama toplamları eşleşmiyor"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Boyutlar eşleşmiyor"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
msgid "Invalid file format"
msgstr "Geçersiz dosya biçimi"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Yazma hatası"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
#, fuzzy
msgid "Does not start with a cleartext signature"
msgstr "%s dosyası açıkimzalı bir iletiyle başlamıyor"
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2540,7 +2692,7 @@ msgstr ""
"indeks dosyaları kullanılacak. GPG hatası: %s:%s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG hatası: %s: %s"
@@ -2556,14 +2708,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2572,17 +2724,17 @@ msgstr ""
"'Release' dosyasında olması beklenilen '%s' girdisi bulunamadı (sources.list "
"dosyasındaki girdi ya da satır hatalı)"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "'Release' dosyasında '%s' için uygun bir sağlama toplamı bulunamadı"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Aşağıdaki anahtar kimlikleri için kullanılır hiçbir genel anahtar yok:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2591,19 +2743,19 @@ msgstr ""
"%s konumundaki 'Release' dosyasının vâdesi dolmuş (%s önce). Bu deponun "
"güncelleştirmeleri uygulanmayacak."
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2612,123 +2764,53 @@ msgstr ""
"%s paketindeki dosyalardan biri konumlandırılamadı. Bu durum, bu paketi elle "
"düzeltmeniz gerektiği anlamına gelebilir. (eksik mimariden dolayı)"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "'%2$s' paketinin '%1$s' sürümü hiçbir kaynakta bulunamadı"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Paket indeks dosyaları bozuk. %s paketinin 'Filename:' alanı yok."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Önbelleğin uyumsuz bir sürümleme sistemi var"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "%s paketi işlenirken sorunlarla karşılaşıldı (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Vay canına, bu APT'nin alabileceği paket adları sayısını aştınız."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Vay canına, bu APT'nin alabileceği sürüm sayısını aştınız."
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Vay canına, bu APT'nin alabileceği açıklama sayısını aştınız."
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Vay canına, bu APT'nin alabileceği bağımlılık sayısını aştınız."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Dosya bağımlılıkları işlenirken %s %s paketi bulunamadı"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Kaynak listesinin (%s) dosya bilgisi alınamadı"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Paket listeleri okunuyor"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Dosya Sağlananları Toplanıyor"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Kaynak önbelleği kaydedilirken GÇ Hatası"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Sağlayıcı bloğu %s parmak izi içermiyor"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Liste dizini %spartial bulunamadı."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Arşiv dizini %spartial bulunamadı."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, c-format
-msgid "Clean of %s is not supported"
-msgstr "%s temizliği desteklenmiyor"
+msgid "Unable to lock directory %s"
+msgstr "%s dizini kilitlenemiyor"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Alınan dosya: %li / %li (%s kaldı)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Alınan dosya: %li / %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Bazı indeks dosyaları indirilemedi. Bu dosyalar yok sayıldılar ya da önceki "
-"sürümleri kullanıldı."
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "'sources.list' dosyası içine bazı 'source' adresleri koymalısınız"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "%s için dosya bilgisi alınamadı."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2752,7 +2834,7 @@ msgstr "İğne türü %s anlaşılamadı"
msgid "No priority (or zero) specified for pin"
msgstr "İğne için öncelik belirlenmedi (ya da sıfır)"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2761,12 +2843,12 @@ msgstr ""
"\"%s\" paketinin anında yapılandırması başarısız oldu. Ayrıntılar için apt."
"conf(5) rehber sayfasının APT::Immediate-Configure kısmına bakın. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr "'%s' paketi yapılandırılamadı. "
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2778,10 +2860,13 @@ msgstr ""
"kötü bir durumdur, ama ille de devam etmek isterseniz, APT::Force-LoopBreak "
"seçeneğini etkinleştirin."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı çok uzun."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Bazı indeks dosyaları indirilemedi. Bu dosyalar yok sayıldılar ya da önceki "
+"sürümleri kullanıldı."
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2852,11 +2937,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Paket listeleri kopyalanıyor..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Yeni kaynak listesi yazılıyor\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Bu disk için olan kaynak listesi girdileri:\n"
@@ -2868,7 +2953,7 @@ msgstr ""
"%s paketinin tekrar kurulması gerekli, ancak gereken arşiv dosyası "
"bulunamıyor."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2876,151 +2961,40 @@ msgstr ""
"Hata, pkgProblemResolver::Resolve bozuk paketlere yol açtı, bu sorunun "
"nedeni tutulan paketler olabilir."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "Sorunlar giderilemedi, tutulan bozuk paketleriniz var."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "Çözücüye senaryo gönder"
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr "Çözücüye istek gönder"
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr "Çözüm almak için hazırlan"
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr "Harici çözücü düzgün bir hata iletisi göstermeden başarısız oldu"
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr "Harici çözücüyü çalıştır"
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Paket dosyası %s ayrıştırılamadı (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Paket dosyası %s ayrıştırılamadı (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "'Release' dosyası (%s) ayrıştırılamadı"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "'Release' dosyası %s içinde hiç bölüm yok"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "'Release' dosyasında (%s) sağlama girdisi yok"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "'Release' dosyasında (%s) geçersiz 'Valid-Until' girdisi"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "'Release' dosyasında (%s) geçersiz 'Date' girdisi"
-
-#: apt-pkg/sourcelist.cc:127
-#, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr ""
-"Kaynak listesinin (%2$s) %1$u numaralı girdisi hatalı (URI ayrıştırma)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] "
-"ayrıştırılamıyor)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([seçenek] çok kısa)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] bir atama "
-"değil)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] seçeneğinin "
-"anahtarı yok)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı ([%3$s] %4$s "
-"anahtarına değer atanmamış)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dist)"
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr ""
-"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (URI ayrıştırma)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Bağımlılık ağacı oluşturuluyor"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (mutlak dist)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Aday sürümler"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Kaynak listesinin (%2$s) %1$lu numaralı satırı hatalı (dağıtım ayrıştırma)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Bağımlılık oluşturma"
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "%s Açılıyor"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Durum bilgisi okunuyor"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)"
+msgid "Failed to open StateFile %s"
+msgstr "Durum dosyası (StateFile) %s açılamadı"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "'%s' türü bilinmiyor. (Satır: %u, Kaynak Listesi: %s)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Geçici durum dosyasına (%s) yazma başarısız oldu"
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "'%s' türü bilinmiyor (girdi: %u, kaynak listesi: %s)"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Paket dosyası %s ayrıştırılamadı (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -3032,42 +3006,42 @@ msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı"
msgid "Version '%s' for '%s' was not found"
msgstr "'%2$s' paketinin '%1$s' sürümü bulunamadı"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "'%s' görevi bulunamadı"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "'%s' düzenli ifadesini içeren herhangi bir paket bulunamadı"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "'%s' ifadesine eşleşen herhangi bir paket bulunamadı"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "'%s' paketi tamamen sanal olduğu için sürümü seçilemiyor"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "'%s' paketi sanal olduğu için en yeni sürümü seçilemiyor"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "'%s' paketinin aday sürümü olmadığı için aday sürüm seçilemiyor"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "'%s' paketi kurulu olmadığı için kurulu sürüm seçilemiyor"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3076,179 +3050,59 @@ msgstr ""
"'%s' paketi kurulu olmadığı ve aday sürüme sahip olmadığı için her ikisi de "
"seçilemiyor"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "%s kuruluyor"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "%s yapılandırılıyor"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "%s kaldırılıyor"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "%s tamamen kaldırılıyor"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "%s paketinin kaybolduğu not ediliyor"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Kurulum sonrası tetikleyicisi %s çalıştırılıyor"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "'%s' dizini bulunamadı"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "'%s' dosyası açılamadı"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "%s hazırlanıyor"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "%s paketi açılıyor"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Preparing to configure %s"
-msgstr "%s paketini yapılandırmaya hazırlanılıyor"
+msgid "Unable to parse Release file %s"
+msgstr "'Release' dosyası (%s) ayrıştırılamadı"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Installed %s"
-msgstr "%s kuruldu"
+msgid "No sections in Release file %s"
+msgstr "'Release' dosyası %s içinde hiç bölüm yok"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "%s paketinin kaldırılmasına hazırlanılıyor"
+msgid "No Hash entry in Release file %s"
+msgstr "'Release' dosyasında (%s) sağlama girdisi yok"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Removed %s"
-msgstr "%s kaldırıldı"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "'Release' dosyasında (%s) geçersiz 'Valid-Until' girdisi"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "%s paketinin tamamen kaldırılmasına hazırlanılıyor"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "'Release' dosyasında (%s) geçersiz 'Date' girdisi"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Completely removed %s"
-msgstr "%s tamamen kaldırıldı"
+msgid "%lid %lih %limin %lis"
+msgstr "%li gün %li saat %li dk. %li sn."
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Can not write log (%s)"
-msgstr "Günlük dosyasına yazılamıyor (%s)"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr "/dev/pts bağlı mı?"
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr "stdout bir uçbirim mi?"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr "İşlem yarıda kesildi"
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-"En fazla rapor miktarına (MaxReports) ulaşıldığı için apport raporu yazılmadı"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "bağımlılık sorunları - yapılandırılmamış durumda bırakılıyor"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Apport raporu yazılmadı çünkü hata iletisi bu durumun bir önceki hatadan "
-"kaynaklanan bir hata olduğunu belirtiyor."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Hata iletisi bir bellek yetersizliği hatasına işaret ettiği için apport "
-"raporu yazılamadı"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Hata iletisi yerel bir sistem hatasına işaret ettiği için apport raporu "
-"yazılamadı"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Hata iletisi bir dpkg G/Ç hatasına işaret ettiği için apport raporu "
-"yazılamadı"
+msgid "%lih %limin %lis"
+msgstr "%li saat %li dk. %li sn."
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Yönetim dizini (%s) kilitlenemiyor, başka bir işlem tarafından kullanılıyor "
-"olmasın?"
+msgid "%limin %lis"
+msgstr "%li dk. %li sn."
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Yönetim dizini (%s) kilitlenemiyor, root kullanıcısı mısınız?"
+msgid "%lis"
+msgstr "%li sn."
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"dpkg kesintiye uğradı, sorunu düzeltmek için elle '%s' komutunu çalıştırın. "
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Kilitlenmemiş"
+msgid "Selection %s not found"
+msgstr "%s seçimi bulunamadı"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3387,35 +3241,6 @@ msgstr "..."
msgid "%c%s... %u%%"
msgstr "%c%s... %u%%"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li gün %li saat %li dk. %li sn."
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li saat %li dk. %li sn."
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%li dk. %li sn."
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%li sn."
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "%s seçimi bulunamadı"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Boş dosya mmap yapılamıyor"
@@ -3480,112 +3305,281 @@ msgstr "Bağlama noktasının (%s) durum bilgisi alınamadı"
msgid "Failed to stat the cdrom"
msgstr "Cdrom durum bilgisi alınamadı"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Tanınamayan tür kısaltması: '%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Yapılandırma dosyası (%s) açılıyor"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Sözdizimi hatası %s:%u: Blok ad olmadan başlıyor."
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Sözdizimi hatası %s:%u: Kötü biçimlendirilmiş etiket"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Sözdizimi hatası %s:%u: Değerden sonra ilave gereksiz"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "Sözdizimi hatası %s:%u: Yönergeler sadece en üst düzeyde bitebilir"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Sözdizimi hatası %s:%u: Çok fazla yuvalanmış 'include'"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Sözdizimi hatası %s:%u: Buradan 'include' edilmiş"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Sözdizimi hatası %s:%u: Desteklenmeyen yönerge '%s'"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Sözdizimi hatası %s:%u: clear yönergesi bir seçenek ağacı argümanını "
"gerektirir"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Sözdizimi hatası %s:%u: Dosya sonunda ilave gereksiz"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Komut satırı seçeneği '%c' [%s içinden] tanınmıyor."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Komut satırı seçeneği %s anlaşılamadı"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Komut satırı seçeneği %s mantıksal değer değil"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "%s seçeneği bir argüman kullanımını gerektirir."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
"%s seçeneği: Yapılandırma öğesi tanımlaması =<değer> şeklinde değer "
"içermelidir."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr ""
"%s seçeneği bir tam sayı argümanının kullanımını gerektirir, '%s' değil"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "'%s' seçeneği çok uzun"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "%s algılaması anlaşılamadı, true (doğru) ya da false (yanlış) deneyin."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Geçersiz işlem: %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "%s kuruluyor"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "%s yapılandırılıyor"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "%s kaldırılıyor"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "%s tamamen kaldırılıyor"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "%s paketinin kaybolduğu not ediliyor"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Kurulum sonrası tetikleyicisi %s çalıştırılıyor"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "'%s' dizini bulunamadı"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "'%s' dosyası açılamadı"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "%s hazırlanıyor"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "%s paketi açılıyor"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "%s paketini yapılandırmaya hazırlanılıyor"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "%s kuruldu"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "%s paketinin kaldırılmasına hazırlanılıyor"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "%s kaldırıldı"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "%s paketinin tamamen kaldırılmasına hazırlanılıyor"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "%s tamamen kaldırıldı"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, c-format
+msgid "Can not write log (%s)"
+msgstr "Günlük dosyasına yazılamıyor (%s)"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr "/dev/pts bağlı mı?"
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "İşlem yarıda kesildi"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+"En fazla rapor miktarına (MaxReports) ulaşıldığı için apport raporu yazılmadı"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "bağımlılık sorunları - yapılandırılmamış durumda bırakılıyor"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Apport raporu yazılmadı çünkü hata iletisi bu durumun bir önceki hatadan "
+"kaynaklanan bir hata olduğunu belirtiyor."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Hata iletisi diskin dolu olduğunu belirttiği için apport raporu yazılamadı"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Hata iletisi bir bellek yetersizliği hatasına işaret ettiği için apport "
+"raporu yazılamadı"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Hata iletisi yerel bir sistem hatasına işaret ettiği için apport raporu "
+"yazılamadı"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Hata iletisi bir dpkg G/Ç hatasına işaret ettiği için apport raporu "
+"yazılamadı"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Yönetim dizini (%s) kilitlenemiyor, başka bir işlem tarafından kullanılıyor "
+"olmasın?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Yönetim dizini (%s) kilitlenemiyor, root kullanıcısı mısınız?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"dpkg kesintiye uğradı, sorunu düzeltmek için elle '%s' komutunu çalıştırın. "
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Kilitlenmemiş"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "DropNode hâlâ bağlı olan düğüm üzerinde çağrıldı"
@@ -3690,7 +3684,7 @@ msgstr "Bu dosya geçerli bir DEB arşivi değil, '%s' üyesi eksik"
msgid "Internal error, could not locate member %s"
msgstr "İç hata, %s üyesi bulunamadı"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Ayrıştırılamayan 'control' dosyası"
@@ -3719,23 +3713,23 @@ msgstr "Arşiv çok kısa"
msgid "Failed to read the archive headers"
msgstr "Arşiv başlıkları okunamadı"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Boru oluşturulamadı"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Gzip çalıştırılamadı "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Bozuk arşiv"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar sağlama toplamı başarısız, arşiv bozulmuş"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Bilinmeyen TAR başlığı türü %u, üye %s"
@@ -3752,6 +3746,9 @@ msgstr "Bilinmeyen TAR başlığı türü %u, üye %s"
#~ msgid "No keyring installed in %s."
#~ msgstr "%s dizininde kurulu bir anahtar yok."
+#~ msgid "Is stdout a terminal?"
+#~ msgstr "stdout bir uçbirim mi?"
+
#~ msgid "ioctl(TIOCGWINSZ) failed"
#~ msgstr "ioctl(TIOCGWINSZ) başarısız oldu"
diff --git a/po/uk.po b/po/uk.po
index 4c2b88120..47976d39c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-all\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2012-09-25 20:19+0300\n"
"Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n"
"Language-Team: Українська <uk@li.org>\n"
@@ -29,146 +29,146 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Пакунок %s версії %s має незадоволену залежність:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Всього імен пакунків: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Всього структур пакунків: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Нормальних пакунків: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Цілком віртуальних пакунків: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Окремих віртуальних пакунків: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Змішаних віртуальних пакунків: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Відсутні: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Всього унікальних версій: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Всього унікальних описів: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Всього залежностей: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Всього відносин Версія/Файл: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Всього відносин Опис/Файл: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
#, fuzzy
msgid "Total Provides mappings: "
msgstr "Всього карт 'Provides': "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Всього відфільтрованих (globbed) рядків: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
#, fuzzy
msgid "Total slack space: "
msgstr "Порожнього місця в кеші: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Загальний простір полічений для: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Перелік пакунків %s розсинхронізований."
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Не знайдено жодного пакунка"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Ви повинні задати не менше одного шаблону пошуку"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr "Ця команда є застарілою. Будь-ласка використовуйте 'apt-mark showauto'"
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Не можу знайти пакунок %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Переліки пакунків:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "Кеш не синхронізований, неможливо знайти посилання на перелік пакунків"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Зафіксовані пакунки:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(не знайдено)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Встановлено: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Кандидат: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(відсутній)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Фіксатор(pin) пакунка: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Таблиця версій:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s для %s скомпільовано %s %s\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -238,20 +238,20 @@ msgstr ""
" -o=? Встановити умовну опцію конфігурації, наприклад, -o dir::cache=/tmp\n"
"Дивіться подробиці на man-сторінках apt-cache(8) і apt.conf(5).\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Задайте назву для цього Диска, наприклад 'Debian 5.0.3 Disk 1'"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Будь-ласка, вставте Диск у пристрій і натисніть Enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Не вдалося під'єднати '%s' до '%s'"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -259,7 +259,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Повторіть цей процес для решти CD з вашого набору."
@@ -295,48 +295,48 @@ msgstr ""
" -с=? Читати зазначений конфігураційний файл.\n"
" -o=? Встановити умовну опцію, наприклад, -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Обираю '%s' як пакунок вихідних текстів, замість '%s'\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, fuzzy, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Ігнорувати недоступну версію '%s' пакунку '%s'"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Не можу знайти пакунок %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s позначений як встановлений вручну.\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s позначений як автоматично встановлений.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -344,31 +344,26 @@ msgstr ""
"Ця команда застаріла. Будь-ласка, використовуйте замість неї 'apt-mark auto' "
"і 'apt-mark manual'."
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "Внутрішня помилка, вирішувач проблем щось поламав"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Неможливо заблокувати директорію %s"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Неможливо заблокувати директорію для завантаження"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
"тексти"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Неможливо знайти пакунок з вихідними текстами для %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -377,7 +372,7 @@ msgstr ""
"УВАГА: Пакування '%s' відбувається в системі контролю версій '%s' на:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -388,70 +383,70 @@ msgstr ""
"bzr branch %s\n"
"щоб отримати найновіші (потенційно не випущені) оновлення до пакунку.\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Пропускаємо вже завантажений файл '%s'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Завантаження вихідних текстів %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Деякі архіви не вдалося завантажити."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Завантаження завершено в режимі \"тільки завантаження\""
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
"Пропускається розпакування вихідних текстів, тому що вже розпаковано в %s\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда розпакування '%s' завершилася невдало.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда побудови '%s' закінчилася невдало.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Породжений процес завершився невдало"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Для перевірки залежностей для побудови необхідно вказати як мінімум один "
"пакунок"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -460,27 +455,27 @@ msgstr ""
"Відсутня інформація про архітектуру для %s. Дивись apt.conf(5) APT::"
"Архітектури для налащтування"
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Обробка залежностей для побудови закінчилася невдало"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Неможливо одержати інформацію про залежності для побудови %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не має залежностей для побудови.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -489,7 +484,7 @@ msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо %s не є дозволеним на "
"'%s' пакунках"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -497,14 +492,14 @@ msgid ""
msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Не вдалося задовольнити залежність типу %s для %s: Встановлений пакунок %s "
"новіше, аніж треба"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -513,7 +508,7 @@ msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо версія пакунку-"
"кандидата %s не задовольняє умови по версіям"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -522,17 +517,17 @@ msgstr ""
"Залежність типу %s для %s не може бути задоволена, бо немає пакунку-"
"кандидата %s потрібної версії"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Залежності для побудови %s не можуть бути задоволені."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Обробка залежностей для побудови закінчилася невдало"
@@ -648,11 +643,11 @@ msgstr ""
"Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні "
"тексти"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -666,52 +661,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "%s не може бути позначений, тому що він не встановлений.\n"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s вже був позначений, як встановлений вручну.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s вже був позначений, як автоматично встановлений.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr "%s вже був зафіксований.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr "%s вже був незафіксований.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Очікував на %s, але його там не було"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr "%s зафіксовано.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "Фіксацію для %s відмінено.\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr "Не вдалося виконати dpkg. Ви root?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
#, fuzzy
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
@@ -954,7 +950,7 @@ msgstr "Час з'єднання з сокетом даних вичерпавс
msgid "Unable to accept connection"
msgstr "Неможливо прийняти з'єднання"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Проблема хешування файла"
@@ -1043,39 +1039,39 @@ msgstr "Сталося щось дивне при спробі отримати
msgid "Unable to connect to %s:%s:"
msgstr "Неможливо під'єднатися до %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його "
"відбиток?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "Знайдено як мінімум один невірний підпис."
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"Неможливо виконати 'apt-key' для перевірки підпису (чи встановлено gnupg?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Невідома помилка виконання apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Наступні підписи були невірними:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1087,31 +1083,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr "Пусті файли не можуть бути правильними архівами"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Помилка запису у файл"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Помилка зчитування з сервера. Віддалена сторона закрила з'єднання"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Помилка зчитування з сервера"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Помилка запису у файл"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Вибір провалився"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Час очікування з'єднання вийшов"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Помилка запису у вихідний файл"
@@ -1119,53 +1115,302 @@ msgstr "Помилка запису у вихідний файл"
msgid "Waiting for headers"
msgstr "Очікування на заголовки"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Невірний рядок заголовку"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP сервер відіслав невірний заголовок 'reply'"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP сервер відіслав невірний заголовок 'Content-Range'"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Цей HTTP сервер має поламану підтримку 'range'"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Невідомий формат дати"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Погана заголовкова інформація"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "З'єднання не вдалося"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Внутрішня помилка"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Виправлення залежностей..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " невдача."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Неможливо скоригувати залежності"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Неможливо мінімізувати набір оновлень"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Виконано"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+"Для виправлення цих помилок ви можете скористатися 'apt-get -f install'."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Незадоволені залежності. Спробуйте використати -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Встановлено]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Встановлено]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Встановлено]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Встановлено]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "але %s вже встановлений"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "але %s буде встановлений"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "але він не може бути встановлений"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "але це віртуальний пакунок"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "але він не встановлений"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "але він не буде встановлений"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " чи"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Пакунки, що мають незадоволені залежності:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "НОВІ пакунки, які будуть встановлені:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Пакунки, які будуть ВИДАЛЕНІ:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Пакунки, які залишені в незмінному стані:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Пакунки, які будуть ОНОВЛЕНІ:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (внаслідок %s) "
+
+#: apt-private/private-output.cc:696
+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"
+"НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "оновлено %lu, встановлено %lu нових, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu перевстановлено, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu замінено на старіші версії, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu відмічено для видалення і %lu не оновлено.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "не встановлено(видалено) до кінця %lu пакунків.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Помилка компіляції регулярного виразу - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Команді update не потрібні аргументи"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"УВАГА: Це тільки симуляція!\n"
+" apt-get потребує права root для реального запуску.\n"
+" Також не забувайте, що блокування вимикається,\n"
+" тому не очікуйте на відповідність поточній реальній ситуації!"
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1438,255 +1683,6 @@ msgstr ""
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Пакунок '%s' не встановлений, тому не видалений\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Виправлення залежностей..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " невдача."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Неможливо скоригувати залежності"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Неможливо мінімізувати набір оновлень"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Виконано"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-"Для виправлення цих помилок ви можете скористатися 'apt-get -f install'."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Незадоволені залежності. Спробуйте використати -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Встановлено]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Встановлено]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Встановлено]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Встановлено]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "але %s вже встановлений"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "але %s буде встановлений"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "але він не може бути встановлений"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "але це віртуальний пакунок"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "але він не встановлений"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "але він не буде встановлений"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " чи"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Пакунки, що мають незадоволені залежності:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "НОВІ пакунки, які будуть встановлені:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Пакунки, які будуть ВИДАЛЕНІ:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Пакунки, які залишені в незмінному стані:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Пакунки, які будуть ОНОВЛЕНІ:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (внаслідок %s) "
-
-#: apt-private/private-output.cc:696
-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"
-"НЕ РОБІТЬ цього, якщо ви НЕ уявляєте собі всі можливі наслідки!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "оновлено %lu, встановлено %lu нових, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu перевстановлено, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu замінено на старіші версії, "
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu відмічено для видалення і %lu не оновлено.\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "не встановлено(видалено) до кінця %lu пакунків.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Помилка компіляції регулярного виразу - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Команді update не потрібні аргументи"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"УВАГА: Це тільки симуляція!\n"
-" apt-get потребує права root для реального запуску.\n"
-" Також не забувайте, що блокування вимикається,\n"
-" тому не очікуйте на відповідність поточній реальній ситуації!"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1740,20 +1736,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "В кеші "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "В кеші:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Отр:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Отр:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Ігн "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Ігн:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Пом "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Пом:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1779,17 +1779,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Неможливо прочитати %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1866,7 +1866,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Об'єднання доступної інформації"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1890,48 +1890,48 @@ msgstr ""
" -c=? Читати зазначений конфігураційний файл\n"
" -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Неможливо прочитати атрибути %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Неможливо записати в %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Неможливо визначити версію debconf. Він встановлений?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Список розширень, припустимих для пакунків, занадто довгий"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Помилка обробки директорії %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr ""
"Список розширень, припустимих для пакунків з вихідними текстами, занадто "
"довгий"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Помилка запису заголовка в повний перелік вмісту пакунків (Contents)"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Помилка обробки повного переліку вмісту пакунків (Contents) %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -2019,11 +2019,11 @@ msgstr ""
" -c=? Використати зазначений конфігураційний файл\n"
" -o=? Вказати довільний параметр конфігурації"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Збігів не виявлено"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "У групі пакунків '%s' відсутні деякі файли"
@@ -2135,22 +2135,22 @@ msgstr " Перевищено ліміт в %sB в DeLink.\n"
msgid "Archive had no package field"
msgstr "Архів не мав поля 'package'"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, fuzzy, c-format
msgid " %s has no override entry\n"
msgstr " Відсутній запис про перепризначення (override) для %s\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " пакунок %s супроводжується %s, а не %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " Відсутній запис про перепризначення вихідних текстів для %s\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " Крім того, відсутній запис про бінарне перепризначення для %s\n"
@@ -2236,7 +2236,7 @@ msgstr "Не вдалося видалити %s"
msgid "Failed to rename %s to %s"
msgstr "Не вдалося перейменувати %s на %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2262,11 +2262,11 @@ msgstr ""
" -c=? Читати зазначений конфігураційний файл\n"
" -o=? Вказати умовну опцію, наприклад, -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Невідомий запис про пакунок!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2339,6 +2339,27 @@ msgstr "Неможливо знайти аутентифікаційний за
msgid "Hash mismatch for: %s"
msgstr "Невідповідність хешу для: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Драйвер для метода %s не знайдено."
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Метод %s стартував некоректно"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Будь-ласка, вставте диск з поміткою: '%s' в привід '%s' і натисніть Enter."
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "Не можу обробити чи відкрити перелік пакунків чи статусний файл."
@@ -2351,177 +2372,306 @@ msgstr "Для виправлення цих помилок Ви можете в
msgid "The list of sources could not be read."
msgstr "Неможливо прочитати перелік вихідних кодів."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Кеш пакунків пустий"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Файл кешу пакунків пошкоджений"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Файл кешу пакунків має несумісну версію"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr "Файл кешу пакунків пошкоджений, занадто малий"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Цей APT не підтримує систему призначення версій '%s'"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Кеш пакунків був побудований для іншої архітектури"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Залежності (Depends)"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Пре-Залежності (PreDepends)"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Пропонує (Suggests)"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Рекомендує (Recommends)"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Конфлікти (Conflicts)"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Заміняє (Replaces)"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Застарілі (Obsoletes)"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Ламає (Breaks)"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Покращує (Enhances)"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "важливі (important)"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "необхідні (required)"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "стандартні (standard)"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "необов'язкові (optional)"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "додаткові (extra)"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Обчислення оновлень"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Драйвер для метода %s не знайдено."
+msgid "Index file type '%s' is not supported"
+msgstr "Тип '%s' індексного файлу не підтримується"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Метод %s стартував некоректно"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (нечитабельний [параметр])"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr ""
-"Будь-ласка, вставте диск з поміткою: '%s' в привід '%s' і натисніть Enter."
+"Спотворений рядок %lu у переліку джерел %s ([параметр] занадто короткий)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не є призначенням)"
+
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не має ключа)"
+
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Спотворений рядок %lu у переліку джерел %s ([%s] ключ %s не має значення)"
+
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (проблема з URI)"
+
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (dist)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (absolute dist)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (dist parse)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Відкриття %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Рядок %u є занадто довгим у переліку джерел %s."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Спотворений рядок %u у переліку джерел %s (тип)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "Тип '%s' індексного файлу не підтримується"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Побудова дерева залежностей"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Неможливо прочитати атрибути %s."
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Версії кандидатів"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Кеш має несумісну систему призначення версій"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Ґенерація залежностей"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Виникла помилка під час обробки %s (%s%d)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Зчитування інформації про стан"
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Ого! Ви перевищили кількість імен пакунків, які APT може обробити."
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Ого! Ви перевищили кількість версій, які APT може обробити."
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Ого! Ви перевищили кількість описів, які APT може обробити."
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Ого! Ви перевищили кількість залежностей, які APT може обробити."
+
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Не вдалося відкрити StateFile %s"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Пакунок %s %s не був знайдений під час обробки залежностей"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Не вдалося записати до тимчасового StateFile файла %s"
+msgid "Couldn't stat source package list %s"
+msgstr "Не вдалося прочитати атрибути переліку вихідних текстів %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Зчитування переліків пакунків"
+
+#: apt-pkg/pkgcachegen.cc:1301
+#, fuzzy
+msgid "Collecting File Provides"
+msgstr "Збирання інформації про 'File Provides'"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Помилка IO під час збереження кешу вихідних текстів"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+#, fuzzy
+msgid "Send scenario to solver"
+msgstr "Відправити сценарій розв'язувачу"
+
+#: apt-pkg/edsp.cc:244
+#, fuzzy
+msgid "Send request to solver"
+msgstr "Відправити запит розв'язувачу"
+
+#: apt-pkg/edsp.cc:323
+#, fuzzy
+msgid "Prepare for receiving solution"
+msgstr "Пригодуватися до отримання розв'язку"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+"Зовнішній розв'язувач завершився невдало без відповідного повідомлення про "
+"помилку"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+#, fuzzy
+msgid "Execute external solver"
+msgstr "Виконати зовнішній розв'язувач"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "не вдалося перейменувати, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Невідповідність хешу MD5Sum"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Невідповідність розміру"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Невірна дія %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Помилка запису"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
#, fuzzy
msgid "Does not start with a cleartext signature"
msgstr "Файл %s починається з не 'clearsigned' повідомленням"
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2531,7 +2681,7 @@ msgstr ""
"попередні індексні файли будуть використані. Помилка GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "Помилка GPG: %s: %s"
@@ -2547,14 +2697,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2563,16 +2713,16 @@ msgstr ""
"Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у "
"sources.list, або пошкоджений файл)"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2581,19 +2731,19 @@ msgstr ""
"Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього "
"репозиторія не будуть застосовані."
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2602,125 +2752,54 @@ msgstr ""
"Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно "
"власноруч виправити цей пакунок. (через відсутність 'arch')"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Індексні файли пакунків пошкоджені. Немає поля 'Filename' для пакунку %s."
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Кеш має несумісну систему призначення версій"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Виникла помилка під час обробки %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Ого! Ви перевищили кількість імен пакунків, які APT може обробити."
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Ого! Ви перевищили кількість версій, які APT може обробити."
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Ого! Ви перевищили кількість описів, які APT може обробити."
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Ого! Ви перевищили кількість залежностей, які APT може обробити."
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Пакунок %s %s не був знайдений під час обробки залежностей"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Не вдалося прочитати атрибути переліку вихідних текстів %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Зчитування переліків пакунків"
-
-#: apt-pkg/pkgcachegen.cc:1308
-#, fuzzy
-msgid "Collecting File Provides"
-msgstr "Збирання інформації про 'File Provides'"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Помилка IO під час збереження кешу вихідних текстів"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Блок постачальника %s не містить відбитку (fingerprint)"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Відсутня директорія зі списками: %spartial"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Відсутня директорія для архівів: %spartial"
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Тип '%s' індексного файлу не підтримується"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "Неможливо заблокувати директорію %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Завантажується файл %li з %li (залишилось %s)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Завантажується файл %li з %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Деякі індексні файли не вдалося завантажити. Вони були зігноровані, або "
-"замість них були використані старіші версії."
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Додайте деякі посилання (URI) на вихідні тексти у ваш sources.list"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Неможливо прочитати атрибути %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2744,7 +2823,7 @@ msgstr "Не зрозумів тип %s для фіксатора пакункі
msgid "No priority (or zero) specified for pin"
msgstr "Не встановлено пріоритету (або стоїть 0) для фіксатора пакунків (pin)"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2753,12 +2832,12 @@ msgstr ""
"Неможливо прямо налаштувати конфігурацію на '%s'. Будь-ласка, дивіться man 5 "
"apt.conf, нижче APT::Immediate-Configure для деталей. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr "Неможливо налаштувати '%s'."
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2770,10 +2849,13 @@ msgstr ""
"погано, але якщо Ви дійсно бажаєте зробити це, активуйте параметр APT::Force-"
"LoopBreak."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Рядок %u є занадто довгим у переліку джерел %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Деякі індексні файли не вдалося завантажити. Вони були зігноровані, або "
+"замість них були використані старіші версії."
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2844,11 +2926,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Копіюються переліки пакунків..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Записується новий перелік вихідних текстів\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Перелік вихідних текстів для цього диска:\n"
@@ -2859,7 +2941,7 @@ msgid ""
msgstr ""
"Пакунок %s повинен бути перевстановленим, але я не можу знайти його архів."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2867,147 +2949,40 @@ msgstr ""
"Помилка, pkgProblemResolver::Resolve згенерував зупинку, це може бути "
"пов'язано з зафіксованими пакунками."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-#, fuzzy
-msgid "Send scenario to solver"
-msgstr "Відправити сценарій розв'язувачу"
-
-#: apt-pkg/edsp.cc:237
-#, fuzzy
-msgid "Send request to solver"
-msgstr "Відправити запит розв'язувачу"
-
-#: apt-pkg/edsp.cc:316
-#, fuzzy
-msgid "Prepare for receiving solution"
-msgstr "Пригодуватися до отримання розв'язку"
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-"Зовнішній розв'язувач завершився невдало без відповідного повідомлення про "
-"помилку"
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-#, fuzzy
-msgid "Execute external solver"
-msgstr "Виконати зовнішній розв'язувач"
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Неможливо проаналізувати файл пакунку %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Неможливо проаналізувати файл пакунку %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Неможливо проаналізувати 'Release' файл %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Немає секцій у 'Release' файлі %s"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Немає запису 'Hash' у 'Release' файлі %s"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Невірний запис 'Valid-Until' у 'Release' файлі %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Невірний запис 'Date' у 'Release' файлі %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (нечитабельний [параметр])"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Спотворений рядок %lu у переліку джерел %s ([параметр] занадто короткий)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не є призначенням)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не має ключа)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Спотворений рядок %lu у переліку джерел %s ([%s] ключ %s не має значення)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (проблема з URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (dist)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Побудова дерева залежностей"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Версії кандидатів"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (absolute dist)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Ґенерація залежностей"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Спотворений рядок %lu у переліку джерел %s (dist parse)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Зчитування інформації про стан"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "Відкриття %s"
+msgid "Failed to open StateFile %s"
+msgstr "Не вдалося відкрити StateFile %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Спотворений рядок %u у переліку джерел %s (тип)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Не вдалося записати до тимчасового StateFile файла %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
-
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Невідомий тип '%s' на рядку %u в переліку джерел %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Неможливо проаналізувати файл пакунку %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -3019,46 +2994,46 @@ msgstr "Випуск '%s' для '%s' не знайдено"
msgid "Version '%s' for '%s' was not found"
msgstr "Версія '%s' для '%s' не знайдена"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Неможливо знайти завдання '%s'"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Неможливо вибирати версії пакунку '%s', так як він є чисто віртуальним"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
"Неможливо вибрати найновішу версію пакунку '%s', так як він є чисто "
"віртуальним"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "Неможливо вибрати версію пакунку %s, так як він не має кандидатів"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Неможливо вибрати встановлену версію пакунку %s, так як такий пакунок не "
"встановлено"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3067,183 +3042,59 @@ msgstr ""
"Неможливо вибрати встановлений пакунок, або версію-кандидат пакунку '%s', "
"так як вони відсутні"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Встановлюється %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Налаштовується %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Видаляється %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "Повністю видаляється %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Взято до відома зникнення %s"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Виконується післяустановочний ініціатор %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Директорія '%s' відсутня"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Неможливо відкрити файл '%s'"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Підготовка %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Unpacking %s"
-msgstr "Розпакування %s"
+msgid "Unable to parse Release file %s"
+msgstr "Неможливо проаналізувати 'Release' файл %s"
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Preparing to configure %s"
-msgstr "Підготовка до конфігурації %s"
+msgid "No sections in Release file %s"
+msgstr "Немає секцій у 'Release' файлі %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Installed %s"
-msgstr "Встановлено %s"
+msgid "No Hash entry in Release file %s"
+msgstr "Немає запису 'Hash' у 'Release' файлі %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Підготовка до видалення %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Невірний запис 'Valid-Until' у 'Release' файлі %s"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Removed %s"
-msgstr "Видалено %s"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Невірний запис 'Date' у 'Release' файлі %s"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Підготовка до повного видалення %s"
+msgid "%lid %lih %limin %lis"
+msgstr "%liд %liг %liхв %liс"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Completely removed %s"
-msgstr "Повністю видалено %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Неможливо записати в %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr "Операцію було перервано до того, як вона мала завершитися"
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-"Звіт apport не був записаний, тому що параметр MaxReports вже досягнув "
-"максимальної величини"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "проблеми з залежностями - залишено неналаштованим"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Звіт apport не був записаний, тому що повідомлення про помилку вказує на те, "
-"що ця помилка є наслідком попередньої невдачі."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
-"відсутність вільного місця на диску"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
-"відсутність вільного місця у пам'яті"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
-"відсутність вільного місця на диску"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
-"помилку В/В (I/O) у dpkg"
+msgid "%lih %limin %lis"
+msgstr "%liг %liхв %liс"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Неможливо заблокувати адміністративну директорію (%s), може її використовує "
-"інший процес?"
+msgid "%limin %lis"
+msgstr "%liхв %liс"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Неможливо заблокувати адміністративну директорію (%s), ви root?"
+msgid "%lis"
+msgstr "%liс"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"dpkg було перервано, ви повинні вручну запустити '%s' аби виправити "
-"проблему. "
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Не заблоковано"
+msgid "Selection %s not found"
+msgstr "Вибір %s не знайдено"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3383,35 +3234,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Виконано"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%liд %liг %liхв %liс"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%liг %liхв %liс"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%liхв %liс"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%liс"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Вибір %s не знайдено"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Неможливо відобразити в пам'яті (mmap) пустий файл"
@@ -3476,112 +3298,285 @@ msgstr "Неможливо прочитати атрибути точки мон
msgid "Failed to stat the cdrom"
msgstr "Не вдалося прочитати атрибути cdrom"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Нерозпізнаваний тип абревіатури: '%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Відкривається конфігураційний файл %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Синтаксична помилка %s:%u: Блок починається без назви."
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Синтаксична помилка %s:%u: спотворений тег"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Синтаксична помилка %s:%u: зайві символи після величини"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Синтаксична помилка %s:%u: Директиви можуть бути виконані тільки на "
"найвищому рівні"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Синтаксична помилка %s:%u: Забагато вмонтованих (nested) включень"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Синтаксична помилка %s:%u: Включено звідси"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Синтаксична помилка %s:%u: Директива '%s' не підтримується"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, fuzzy, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Синтаксична помилка %s:%u: 'clear directive' потребує дерево налаштувань як "
"аргумент"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Синтаксична помилка %s:%u: Зайве сміття в кінці файла"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Невідомий параметр командного рядка '%c' [з %s]."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Незрозумілий параметр %s командного рядка"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Параметр %s командного рядка не є логічного типу 'boolean'"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Параметр %s потребує аргумента."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr ""
"Опція %s: Специфікація вимагає, щоб рядки у конфігурації мали вираз =<val>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "Параметр %s потребує цілочислений аргумент, але не '%s'"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Параметр '%s' є занадто довгим"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "Незрозумілий вираз %s, спробуйте true чи false."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Невірна дія %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Встановлюється %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Налаштовується %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Видаляється %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "Повністю видаляється %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Взято до відома зникнення %s"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Виконується післяустановочний ініціатор %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Директорія '%s' відсутня"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Неможливо відкрити файл '%s'"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Підготовка %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Розпакування %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Підготовка до конфігурації %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "Встановлено %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Підготовка до видалення %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "Видалено %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Підготовка до повного видалення %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "Повністю видалено %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Неможливо записати в %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "Операцію було перервано до того, як вона мала завершитися"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+"Звіт apport не був записаний, тому що параметр MaxReports вже досягнув "
+"максимальної величини"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "проблеми з залежностями - залишено неналаштованим"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Звіт apport не був записаний, тому що повідомлення про помилку вказує на те, "
+"що ця помилка є наслідком попередньої невдачі."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
+"відсутність вільного місця на диску"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
+"відсутність вільного місця у пам'яті"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
+"відсутність вільного місця на диску"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
+"помилку В/В (I/O) у dpkg"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Неможливо заблокувати адміністративну директорію (%s), може її використовує "
+"інший процес?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Неможливо заблокувати адміністративну директорію (%s), ви root?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"dpkg було перервано, ви повинні вручну запустити '%s' аби виправити "
+"проблему. "
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Не заблоковано"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "DropNode було викликано для вузла, що ще використовувався"
@@ -3689,7 +3684,7 @@ msgstr "Невірний DEB архів, відсутній член '%s'"
msgid "Internal error, could not locate member %s"
msgstr "Внутрішня помилка, не можу знайти складову частину %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Контрольний файл не можливо обробити"
@@ -3719,23 +3714,23 @@ msgstr "Архів занадто малий"
msgid "Failed to read the archive headers"
msgstr "Не вдалося прочитати заголовки в архіві"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Не вдалося створити канали (pipes)"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Не вдалося виконати gzip "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Пошкоджений архів"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Контрольна сума tar архіва невірна, архів пошкоджений"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Невідомий тип заголовку TAR - %u, член %s"
diff --git a/po/vi.po b/po/vi.po
index 3280a7424..2edb52f22 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.0.8\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2014-09-12 13:48+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -27,146 +27,146 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Gói %s phiên bản %s có phần phụ thuộc chưa thỏa mãn:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "Tổng các tên gói: "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "Tổng các cấu trúc gói: "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " Gói thường: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " Gói thuần ảo: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " Gói ảo đơn: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " Gói ảo hỗn hợp: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Thiếu: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "Tổng phiên bản riêng: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "Tổng mô tả riêng: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "Tổng gói phụ thuộc: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "Tổng liên quan phiên bản và tập tin: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "Tổng quan hệ mô-tả/tập-tin: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "Tổng ánh xạ Cung cấp: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Tổng chuỗi mở rộng mẫu tìm kiếm: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Tổng chỗ trống: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "Tổng chỗ đã tính dành cho: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, 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:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Không tìm thấy gói"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "Bạn phải đưa ra ít nhất một mẫu tìm kiếm"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
"Lệnh này đã lỗi thời. Xin hãy dùng lệnh “apt-mark showauto” để thay thế."
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Không thể định vị gói %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "Tập tin gói:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
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"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "Các gói đã ghim:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(không tìm thấy)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Đã cài đặt: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Ứng cử: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(không)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " Ghim gói: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " Bảng phiên bản:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s-%s được biên dịch cho %s vào lúc “%s %s”\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -240,20 +240,20 @@ msgstr ""
"Để tìm thông tin thêm, xem hai trang hướng dẫn\n"
" apt-cache(8) và apt.conf(5).\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "Hãy cung cấp tên cho Đĩa này, kiểu như là: “Debian 5.0.3 Đĩa 1”"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Hãy đưa đĩa vào ổ rồi bấm nút Enter"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Gặp lỗi khi gắn “%s” vào “%s”"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -266,7 +266,7 @@ msgstr ""
"Xem “man apt-cdrom” để có thêm thông tin về tự động dò tìm CD-ROM và điểm "
"gắn."
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "Hãy lặp lại tiến trình này cho các Đĩa còn lại trong bộ đĩa của bạn."
@@ -304,48 +304,48 @@ msgstr ""
" -c=? Đọc tập tin cấu hình này\n"
" -o=? Đặt một tùy chọn cấu hình tùy ý, ví dụ -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Không tìm thấy gói cho kiến trúc “%s”"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Không tìm thấy gói “%s” với phiên bản “%s”"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Không tìm thấy gói “%s” với số phát hành “%s”"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Đang chọn “%s” làm gói nguồn, thay thế cho “%s”\n"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr "Không tìm thấy phiên bản “%s” của gói “%s”"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Không tìm thấy gói %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, 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:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s được đặt thành “được tự động cài đặt”.\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
@@ -353,29 +353,24 @@ msgstr ""
"Lệnh này đã lỗi thời. Xin hãy dùng lệnh “apt-mark auto” và “apt-mark manual” "
"để thay thế."
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
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:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Không thể khoá thư mục %s"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Không thể khoá thư mục tải về"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "Phải chỉ định ít nhất một gói để mà lấy mã nguồn về cho nó"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, 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:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -385,7 +380,7 @@ msgstr ""
"“%s” tại:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -396,68 +391,68 @@ msgstr ""
"bzr branch %s\n"
"để lấy các gói mới nhất (có thể là chưa phát hành).\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Đang bỏ qua tập tin đã được tải về “%s”\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, 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"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Cần phải lấy %sB từ kho nguồn.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "Lấy mã nguồn %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Gặp lỗi khi lấy một số kho."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Hoàn tất việc tải về và trong chế độ chỉ tải về"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, 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:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Lệnh giải nén “%s” bị lỗi.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, 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ài đặt chưa.\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Lệnh biên dịch “%s” bị lỗi.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Tiến trình con bị lỗi"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Phải chỉ ra ít nhất một gói cần kiểm tra các phần phụ thuộc cần khi biên dịch"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
@@ -466,27 +461,27 @@ msgstr ""
"Không có thông tin kiến trúc sẵn sàng cho %s. Xem apt.conf(5) APT::"
"Architectures để cài đặt"
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Gặp lỗi khi xử lý các quan hệ phụ thuộc khi biên dịch"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Không thể lấy thông tin về các phần phụ thuộc khi biên dịch cho %s"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s không phụ thuộc vào gì khi biên dịch.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -495,7 +490,7 @@ msgstr ""
"Phần phụ thuộc %s cho %s không ổn thỏa bởi vì %s không được cho phép trên "
"gói “%s”"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -503,14 +498,14 @@ msgid ""
msgstr ""
"Phần phụ thuộc %s cho %s không thể được thỏa mãn vì không tìm thấy gói %s"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Việc cố thỏa mãn quan hệ phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s là "
"quá mới"
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -519,7 +514,7 @@ msgstr ""
"phần phụ thuộc %s cho %s không thể được thỏa mãn phiên bản ứng cử của gói %s "
"có thể thỏa mãn điều kiện phiên bản"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -528,17 +523,17 @@ msgstr ""
"phần phụ thuộc %s cho %s không thể được thỏa mãn bởi vì gói %s không có bản "
"ứng cử"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, 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:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Không thể thỏa mãn quan hệ phụ thuộc khi biên dịch cho %s."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Gặp lỗi khi xử lý các quan hệ phụ thuộc khi biên dịch"
@@ -653,11 +648,11 @@ msgstr "Cần một URL làm đối số"
msgid "Must specify at least one pair url/filename"
msgstr "Phải chỉ định ít nhất một cặp url/tên-tập-tin"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr "Gặp lỗi khi tải về"
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -681,54 +676,55 @@ msgstr ""
"\n"
" Lệnh trợ giúp APT này có Sức Mạnh của Siêu “Meep”.\n"
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "không thể đánh dấu %s như là nó chưa được cài đặt.\n"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s được đặt thành được cài đặt bằng tay.\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s đã sẵn được đặt thành cài đặt tự động rồi.\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, c-format
msgid "%s was already set on hold.\n"
msgstr "%s đã sẵn được đặt là giữ lại.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, c-format
msgid "%s was already not hold.\n"
msgstr "%s đã sẵn được đặt là không giữ lại.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Cần %s nhưng mà không thấy nó ở đây"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, c-format
msgid "%s set on hold.\n"
msgstr "%s được đặt là giữ lại.\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, c-format
msgid "Canceled hold on %s.\n"
msgstr "Hủy bỏ nắm giữ %s.\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
"Thực thi lệnh “dpkg” gặp lỗi. Bạn có cần quyền siêu người dùng để thực thi "
"lệnh này"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -992,7 +988,7 @@ msgstr "Quá giờ kết nối ổ cắm dữ liệu"
msgid "Unable to accept connection"
msgstr "Không thể chấp nhận kết nối"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Gặp vấn đề băm tập tin"
@@ -1081,23 +1077,23 @@ msgstr "Một số hư hỏng đã xảy ra khi phân giải “%s:%s” (%i - %
msgid "Unable to connect to %s:%s:"
msgstr "Không thể kết nối đến %s: %s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
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ể xác định vân tay của khóa?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
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:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
"Không thể thực hiện “apt-key” để thẩm tra chữ ký (gnupg đã được cài đặt "
"chưa?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
@@ -1106,15 +1102,15 @@ msgstr ""
"Tập tin Clearsigned không hợp lệ, nhận được “%s” (mạng yêu cầu xác nhận phải "
"không?)"
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "Gặp lỗi không rõ khi thực hiện apt-key"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "Những chữ ký theo đây không hợp lệ:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1125,31 +1121,31 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr "Các tập tin trống rỗng không phải là kho lưu hợp lệ"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Gặp lỗi khi ghi vào tập tin"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "Gặp lỗi khi đọc từ máy phục vụ: Máy chủ đã đóng kết nối"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Gặp lỗi khi đọc từ máy phục vụ"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Gặp lỗi khi ghi vào tập tin"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Việc chọn bị lỗi"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Kết nối đã quá giờ"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Gặp lỗi khi ghi vào tập tin đầu ra"
@@ -1157,57 +1153,297 @@ msgstr "Gặp lỗi khi ghi vào tập tin đầu ra"
msgid "Waiting for headers"
msgstr "Đang đợi phần đầu dữ liệu..."
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Dòng đầu sai"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
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/server.cc:172
+#: methods/server.cc:173
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 dung) không "
"hợp lệ"
-#: methods/server.cc:195
+#: methods/server.cc:193
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 vi nội dung) không "
"hợp lệ"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "Máy phục vụ HTTP không hỗ trợ tải một phần tập tin"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Không rõ định dạng ngày"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "Dữ liệu phần đầu sai"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Kết nối bị lỗi"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Gặp lỗi nội bộ"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "Đang liệt kê"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "Ở đây có %i phiên bản phụ thêm. Hãy dùng tùy chọn “-a” để xem."
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Đang sửa chữa quan hệ phụ thuộc..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " gặp lỗi."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Không thể sửa phần phụ thuộc"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Không thể tối thiểu hóa tập hợp nâng cấp"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Xong"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Bạn có thể chạy lệnh “apt-get -f install” để sửa những lỗi trên."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Chưa thỏa mãn quan hệ phụ thuộc. Hãy thử dùng tùy chọn “-f”."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "không hiểu"
+
+#: apt-private/private-output.cc:265
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[đã cài, có thể nâng cấp thành: %s]"
+
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr "[đã cài đặt,nội bộ]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[đã cài,có thể tự động gỡ bỏ]"
+
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr "[đã cài đặt,tự động]"
+
+#: apt-private/private-output.cc:274
+msgid "[installed]"
+msgstr "[đã cài đặt]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[có thể nâng cấp từ: %s]"
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr "[residual-config]"
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "nhưng mà %s đã được cài đặt"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "nhưng mà %s sẽ được cài đặt"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "nhưng mà nó không có khả năng cài đặt"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "nhưng mà nó là gói ảo"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "nhưng mà nó không được cài đặt"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "nhưng mà nó sẽ không được cài đặt"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " hay"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Những gói theo đây chưa thỏa mãn quan hệ phụ thuộc:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Những gói MỚI sau sẽ được CÀI ĐẶT:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Những gói sau sẽ bị GỠ BỎ:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Những gói sau đây được giữ lại:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Những gói sau đây sẽ được NÂNG CẤP:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Những gói sau đây sẽ bị HẠ CẤP:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Những gói giữ lại sau đây sẽ bị THAY ĐỔI:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (bởi vì %s) "
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"CẢNH BÁO: Có những gói chủ yếu sau đây sẽ bị gỡ bỏ.\n"
+"ĐỪNG làm như thế trừ khi bạn biết chính xác mình đang làm gì!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu nâng cấp, %lu được cài đặt mới, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu được cài đặt lại, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu bị hạ cấp, "
+
+#: apt-private/private-output.cc:735
+#, 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"
+
+#: apt-private/private-output.cc:739
+#, 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"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[C/k]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[c/K]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "C"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "K"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Lỗi biên dịch biểu thức chính quy - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Lệnh cập nhật không chấp nhận đối số"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"%i gói có thể được cập nhật. Chạy “apt list --upgradable” để xem chúng.\n"
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr "Mọi gói đã được cập nhật."
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr "Đang sắp xếp"
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "Ở đây có %i bản ghi phụ thêm. Hãy dùng tùy chọn “-a” để xem"
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "không là gói thật (ảo)"
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+"CHÚ Ý: đây chỉ là mô phỏng!\n"
+" apt-get yêu cầu quyền root để thực hiện thật.\n"
+" Cần nhớ rằng chức năng khóa đã bị tắt,\n"
+" nên có thể nó không chính xác như khi làm thật!"
+
#: apt-private/private-install.cc:81
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!"
@@ -1463,246 +1699,6 @@ msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó. Có phải ý
msgid "Package '%s' is not installed, so not removed\n"
msgstr "Gói %s chưa được cài đặt, thế nên không thể gỡ bỏ nó\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr "Đang liệt kê"
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] "Ở đây có %i phiên bản phụ thêm. Hãy dùng tùy chọn “-a” để xem."
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Đang sửa chữa quan hệ phụ thuộc..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " gặp lỗi."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Không thể sửa phần phụ thuộc"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Không thể tối thiểu hóa tập hợp nâng cấp"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Xong"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Bạn có thể chạy lệnh “apt-get -f install” để sửa những lỗi trên."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Chưa thỏa mãn quan hệ phụ thuộc. Hãy thử dùng tùy chọn “-f”."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr "không hiểu"
-
-#: apt-private/private-output.cc:265
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "[đã cài, có thể nâng cấp thành: %s]"
-
-#: apt-private/private-output.cc:268
-msgid "[installed,local]"
-msgstr "[đã cài đặt,nội bộ]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr "[đã cài,có thể tự động gỡ bỏ]"
-
-#: apt-private/private-output.cc:272
-msgid "[installed,automatic]"
-msgstr "[đã cài đặt,tự động]"
-
-#: apt-private/private-output.cc:274
-msgid "[installed]"
-msgstr "[đã cài đặt]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr "[có thể nâng cấp từ: %s]"
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr "[residual-config]"
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "nhưng mà %s đã được cài đặt"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "nhưng mà %s sẽ được cài đặt"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "nhưng mà nó không có khả năng cài đặt"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "nhưng mà nó là gói ảo"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "nhưng mà nó không được cài đặt"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "nhưng mà nó sẽ không được cài đặt"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " hay"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Những gói theo đây chưa thỏa mãn quan hệ phụ thuộc:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Những gói MỚI sau sẽ được CÀI ĐẶT:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Những gói sau sẽ bị GỠ BỎ:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "Những gói sau đây được giữ lại:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "Những gói sau đây sẽ được NÂNG CẤP:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Những gói sau đây sẽ bị HẠ CẤP:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Những gói giữ lại sau đây sẽ bị THAY ĐỔI:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (bởi vì %s) "
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"CẢNH BÁO: Có những gói chủ yếu sau đây sẽ bị gỡ bỏ.\n"
-"ĐỪNG làm như thế trừ khi bạn biết chính xác mình đang làm gì!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu nâng cấp, %lu được cài đặt mới, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu được cài đặt lại, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu bị hạ cấp, "
-
-#: apt-private/private-output.cc:735
-#, 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"
-
-#: apt-private/private-output.cc:739
-#, 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"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr "[C/k]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr "[c/K]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "C"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr "K"
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Lỗi biên dịch biểu thức chính quy - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Lệnh cập nhật không chấp nhận đối số"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-"%i gói có thể được cập nhật. Chạy “apt list --upgradable” để xem chúng.\n"
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr "Mọi gói đã được cập nhật."
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] "Ở đây có %i bản ghi phụ thêm. Hãy dùng tùy chọn “-a” để xem"
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr "không là gói thật (ảo)"
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"CHÚ Ý: đây chỉ là mô phỏng!\n"
-" apt-get yêu cầu quyền root để thực hiện thật.\n"
-" Cần nhớ rằng chức năng khóa đã bị tắt,\n"
-" nên có thể nó không chính xác như khi làm thật!"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1756,20 +1752,24 @@ msgid "Full Text Search"
msgstr "Tìm kiếm toàn văn"
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Tìm thấy "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Tìm thấy:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Lấy:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Lấy:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Bỏq "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Bỏq:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Lỗi "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Lỗi:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1795,17 +1795,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Không thể đọc %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1879,7 +1879,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Đang hòa trộn các thông tin sẵn có..."
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1907,46 +1907,46 @@ msgstr ""
" -c=? Đọc tập tin cấu hình này\n"
" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, c-format
msgid "Unable to mkstemp %s"
msgstr "Không thể tạo tập tin tạm (hàm mkstemp) %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Không thể ghi vào %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
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:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Danh sách mở rộng gói quá dài"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "Gặp lỗi khi xử lý thư mục %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Danh sách mở rộng nguồn quá dài"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
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:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "Gặp lỗi khi xử lý nội dung %s"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -2042,11 +2042,11 @@ msgstr ""
" -c=? Đọc tập tin cấu hình này\n"
" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Không có cái được chọn khớp được"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, 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”."
@@ -2157,22 +2157,22 @@ msgstr " Hết hạn bỏ liên kết của %sB.\n"
msgid "Archive had no package field"
msgstr "Kho không có trường gói"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s không có mục ghi đè (override)\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " người bảo trì %s là %s không phải %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s không có mục ghi đè (override) nguồn\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s cũng không có mục ghi đè (override) nhị phân\n"
@@ -2258,7 +2258,7 @@ msgstr "Gặp lỗi khi bỏ liên kết %s"
msgid "Failed to rename %s to %s"
msgstr "Việc đổi tên %s thành %s bị lỗi"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2283,11 +2283,11 @@ msgstr ""
" -c=? Đọc tập tin cấu hình này\n"
" -o=? Đặt một tùy chọn cấu hình tùy ý, v.d. “-o dir::cache=/tmp”\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Không hiểu bản ghi gói!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2363,6 +2363,26 @@ msgstr "Không tìm thấy bản ghi xác thực cho: %s"
msgid "Hash mismatch for: %s"
msgstr "Sai khớp chuỗi duy nhất cho: %s"
+#: apt-pkg/acquire-worker.cc:133
+#, 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 thức %s."
+
+#: apt-pkg/acquire-worker.cc:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "Gói “%s” đã được cài đặt chưa?"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Phương thức %s đã không khởi chạy đúng đắn."
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Hãy cho đĩa có nhãn “%s” vào ổ “%s” rồi bấm nút Enter."
+
#: apt-pkg/cachefile.cc:94
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."
@@ -2377,175 +2397,305 @@ msgstr ""
msgid "The list of sources could not be read."
msgstr "Không thể đọc danh sách nguồn."
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Bộ nhớ tạm gói trống"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Tập tin nhớ tạm gói bị hỏng"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Tập tin nhớ tạm gói là một phiên bản không tương thích"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
msgstr "Tập tin nhớ tạm gói bị hỏng, nó quá nhỏ"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, 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:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Bộ nhớ tạm gói được biên dịch cho một kiến trúc khác"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Phụ thuộc"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "Phụ thuộc sẵn"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Đề nghị"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Khuyến khích"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Xung đột"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Thay thế"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Cũ"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "Làm hỏng"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "Tăng cường"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "quan trọng"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "yêu cầu"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "chuẩn"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "tùy chọn"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "bổ sung"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "Đang tính toán nâng cấp"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, 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 thức %s."
+msgid "Index file type '%s' is not supported"
+msgstr "Không hỗ trợ kiểu tập tin chỉ mục “%s”"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, c-format
-msgid "Is the package %s installed?"
-msgstr "Gói “%s” đã được cài đặt chưa?"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Gặp đoạn sai dạng %u trong danh sách nguồn %s (ngữ pháp URI)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Phương thức %s đã không khởi chạy đúng đắn."
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân "
+"tích được)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Hãy cho đĩa có nhãn “%s” vào ổ “%s” rồi bấm nút Enter."
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Không hỗ trợ kiểu tập tin chỉ mục “%s”"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép "
+"gán)"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "Đang xây dựng cây quan hệ phụ thuộc"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)"
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "Phiên bản ứng cử"
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá "
+"trị)"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "Tạo ra quan hệ phụ thuộc"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "Đang đọc thông tin về tình trạng"
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)"
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Lỗi mở tập tin tình trạng StateFile %s"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:217
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s"
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+"Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+"Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "Đang mở %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, 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:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)."
+
+#: apt-pkg/sourcelist.cc:375
+#, 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:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Không hiểu kiểu “%s” trên đoạn %u trong danh sách nguồn %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr "Không hỗ trợ việc xóa %s"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Không thể lấy trạng thái về %s."
+
+#: apt-pkg/pkgcachegen.cc:113
+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"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Có lỗi phát sinh khi xử lý %s (%s%d)"
+
+#: apt-pkg/pkgcachegen.cc:273
+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:276
+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:279
+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:282
+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:591
+#, 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ý quan hệ phụ thuộc của tập tin"
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, 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:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Đang đọc các danh sách gói"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Đang tập hợp các Nhà cung cấp Tập tin"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "Gửi kịch bản đến bộ phân giải"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "Gửi yêu cầu đến bộ phân giải"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "Chuẩn bị để lấy cách giải quyết"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "Thi hành bộ phân giải từ bên ngoài"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "gặp lỗi khi đổi tên, %s (%s → %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Mã băm tổng kiểm tra không khớp"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Kích cỡ không khớp nhau"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
msgid "Invalid file format"
msgstr "Định dạng tập tập tin không hợp lệ"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Lỗi ghi"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
#, fuzzy
msgid "Does not start with a cleartext signature"
msgstr "Tập tin %s không bắt đầu bằng một đoạn chữ ký (gpg)"
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2556,7 +2706,7 @@ msgstr ""
"Lỗi GPG: %s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "Lỗi GPG: %s: %s"
@@ -2572,14 +2722,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2588,16 +2738,16 @@ msgstr ""
"Không tìm thấy mục cần thiết “%s” trong tập tin Phát hành (Sai mục trong "
"sources.list hoặc tập tin bị hỏng)"
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Không thể tìm thấy mã băm tổng kiểm tra cho tập tin Phát hành %s"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
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 mã số khoá theo đây:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
@@ -2606,19 +2756,19 @@ msgstr ""
"Tập tin phát hành %s đã hết hạn (không hợp lệ kể từ %s). Cập nhật cho kho "
"này sẽ không được áp dụng."
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2627,12 +2777,12 @@ 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:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr "Không tìm thấy nguồn cho việc tải về phiên bản “%s” of “%s”"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2640,113 +2790,43 @@ 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/pkgcachegen.cc:113
-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"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Có lỗi phát sinh khi xử lý %s (%s%d)"
-
-#: apt-pkg/pkgcachegen.cc:273
-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:276
-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:279
-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:282
-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:591
-#, 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ý quan hệ phụ thuộc của tập tin"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, 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:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "Đang đọc các danh sách gói"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Đang tập hợp các Nhà cung cấp Tập tin"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Khối nhà bán %s không chứa vân tay"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "Thiếu thư mục danh sách %spartial."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Thiếu thư mục kho lưu %spartial."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, c-format
-msgid "Clean of %s is not supported"
-msgstr "Không hỗ trợ việc xóa %s"
+msgid "Unable to lock directory %s"
+msgstr "Không thể khoá thư mục %s"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Đang tải tập tin thứ %li trong tổng số %li (còn lại %s)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "Đang tải tập tin %li trong tổng số %li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-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. Chúng đã bị bỏ qua, hoặc cái cũ đã "
-"được dùng thay thế."
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
"Bạn phải để một số địa chỉ URI “nguồn” vào “sources.list” (danh sách nguồn)"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Không thể lấy trạng thái về %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2771,7 +2851,7 @@ msgstr "Không hiểu kiểu ghim %s"
msgid "No priority (or zero) specified for pin"
msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2780,12 +2860,12 @@ msgstr ""
"Không thể thực hiện ngay lập tức tiến trình cấu hình “%s”. Xem “man 5 apt."
"conf ” dưới “APT::Immediate-Configure” để tìm chi tiết. (%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, c-format
msgid "Could not configure '%s'. "
msgstr "Không thể cấu hình “%s”. "
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2797,10 +2877,13 @@ msgstr ""
"bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn “APT::Force-"
"LoopBreak” (buộc ngắt vòng lặp)."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, 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/update.cc:103 apt-pkg/update.cc:105
+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. Chúng đã bị bỏ qua, hoặc cái cũ đã "
+"được dùng thay thế."
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2870,11 +2953,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Đang sao chép các danh sách gói..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "Đang ghi danh sách nguồn mới\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "Các mục tin danh sách nguồn cho đĩa này:\n"
@@ -2884,7 +2967,7 @@ 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:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2892,151 +2975,40 @@ 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:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "Không thể sửa trục trặc này, bạn đã giữ lại một số gói bị hỏng."
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr "Gửi kịch bản đến bộ phân giải"
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr "Gửi yêu cầu đến bộ phân giải"
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr "Chuẩn bị để lấy cách giải quyết"
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr "Bộ phân giải bên ngoài gặp lỗi mà không trả về thông tin lỗi thích hợp"
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr "Thi hành bộ phân giải từ bên ngoài"
-
-#: apt-pkg/tagfile.cc:169
-#, 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:269
-#, 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/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Không có phần nào trong tập tin Phát hành %s"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Không có mục Hash (chuỗi duy nhất) nào trong tập tin Phát hành %s"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
-"Gặp mục tin “Valid-Until” (hợp lệ đến khi) không hợp lệ trong tập tin Phát "
-"hành %s"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
-"Gặp mục tin “Date” (ngày tháng) không hợp lệ trong tập tin Phát hành %s"
-
-#: apt-pkg/sourcelist.cc:127
-#, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Gặp đoạn sai dạng %u trong danh sách nguồn %s (ngữ pháp URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Gặp dòng có sai dạng %lu trong danh sách nguồn %s ([tùy chọn] không thể phân "
-"tích được)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s ([tùy chọn] quá ngắn)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không phải là một phép "
-"gán)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Gặp dòng sai dạng %lu trong danh sách nguồn %s ([%s] không có khoá nào)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Gặp dòng sai dạng %lu trong danh sách nguồn %s (khoá [%s] %s không có giá "
-"trị)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (địa chỉ URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối)"
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Gặp dòng sai dạng %lu trong danh sách nguồn %s (ngữ pháp URI)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "Đang xây dựng cây quan hệ phụ thuộc"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-"Gặp dòng sai dạng %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "Phiên bản ứng cử"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Gặp dòng sai dạng %lu trong danh sách nguồn %s (phân tách bản phân phối)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "Tạo ra quan hệ phụ thuộc"
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Đang mở %s"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "Đang đọc thông tin về tình trạng"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)."
+msgid "Failed to open StateFile %s"
+msgstr "Lỗi mở tập tin tình trạng StateFile %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/depcache.cc:258
#, 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."
+msgid "Failed to write temporary StateFile %s"
+msgstr "Gặp lỗi khi ghi tập tin tình trạng StateFile tạm thời %s"
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Không hiểu kiểu “%s” trên đoạn %u trong danh sách nguồn %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Không thể phân tích tập tin gói %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -3048,44 +3020,44 @@ msgstr "Không tìm thấy bản phát hành “%s” cho “%s”"
msgid "Version '%s' for '%s' was not found"
msgstr "Không tìm thấy phiên bản “%s” cho “%s”"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "Không tìm thấy tác vụ “%s”"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Không tìm thấy gói nào theo biểu thức chính quy “%s”"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Không tìm thấy gói nào theo đường dẫn “%s”"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "Không thể chọn phiên bản trong gói “%s” vì nó chỉ là ảo"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "Không thể chọn phiên bản mới nhất trong gói “%s” vì nó chỉ là ảo"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "Không thể chọn phiên bản ứng cử trong gói %s vì nó không có ứng cử"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
"Không thể chọn phiên bản được cài đặt trong gói %s vì nó không phải được cài "
"đặt"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
@@ -3094,179 +3066,62 @@ msgstr ""
"Không thể chọn phiên bản được cài đặt hoặc phiên bản ứng cử trong gói “%s” "
"mà không có trong nó"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "Đang cài đặt %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "Đang cấu hình %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "Đang gỡ bỏ %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "Đang gỡ bỏ hoàn toàn %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Đang ghi chép sự biến mất của %s"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Đang chạy bẫy sau-cài-đặt %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Thiếu thư mục “%s”"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Không thể mở tập tin “%s”"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "Đang chuẩn bị %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "Đang mở gói %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Preparing to configure %s"
-msgstr "Đang chuẩn bị cấu hình %s"
+msgid "Unable to parse Release file %s"
+msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Installed %s"
-msgstr "Đã cài đặt %s"
+msgid "No sections in Release file %s"
+msgstr "Không có phần nào trong tập tin Phát hành %s"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Đang chuẩn bị gỡ bỏ %s"
+msgid "No Hash entry in Release file %s"
+msgstr "Không có mục Hash (chuỗi duy nhất) nào trong tập tin Phát hành %s"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Removed %s"
-msgstr "Đã gỡ bỏ %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr ""
+"Gặp mục tin “Valid-Until” (hợp lệ đến khi) không hợp lệ trong tập tin Phát "
+"hành %s"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Đang chuẩn bị gỡ bỏ hoàn toàn %s"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr ""
+"Gặp mục tin “Date” (ngày tháng) không hợp lệ trong tập tin Phát hành %s"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Completely removed %s"
-msgstr "Gỡ bỏ hoàn toàn %s"
+msgid "%lid %lih %limin %lis"
+msgstr "%li ngày %li giờ %li phút %li giây"
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Can not write log (%s)"
-msgstr "Không thể ghi nhật ký (%s)"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr "/dev/pts đã gắn chưa?"
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr "Đầu ra là thiết bị cuối?"
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành"
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-"Không ghi báo cáo apport, vì đã chạm giới hạn số các báo cáo (MaxReports)"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp "
-"do một sự thất bại trước đó."
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ "
-"bộ nhớ”"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ "
-"thống nội bộ"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “V/R dpkg”"
+msgid "%lih %limin %lis"
+msgstr "%li giờ %li phút %li giây"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
-"Không thể khoá thư mục quản trị (%s), có một tiến trình khác đang sử dụng nó "
-"phải không?"
+msgid "%limin %lis"
+msgstr "%li phút %li giây"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Không thể khoá thư mục quản trị (%s), bạn có quyền root không?"
+msgid "%lis"
+msgstr "%li giây"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-"dpkg bị ngắt giữa chừng, bạn cần phải chạy “%s” một cách thủ công để giải "
-"vấn đề này. "
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "Chưa được khoá"
+msgid "Selection %s not found"
+msgstr "Không tìm thấy vùng chọn %s"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3405,35 +3260,6 @@ msgstr "..."
msgid "%c%s... %u%%"
msgstr "%c%s... %u%%"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li ngày %li giờ %li phút %li giây"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li giờ %li phút %li giây"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%li phút %li giây"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%li giây"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Không tìm thấy vùng chọn %s"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Không thể mmap (ánh xạ bộ nhớ) tập tin rỗng"
@@ -3498,109 +3324,278 @@ msgstr "Không thể lấy các thông tin cho điểm gắn kết %s"
msgid "Failed to stat the cdrom"
msgstr "Việc lấy các thông tin thống kê đĩa CD-ROM bị lỗi"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Không chấp nhận kiểu viết tắt: “%c”"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Đang mở tập tin cấu hình %s..."
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, 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:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Gặp lỗi cú pháp %s:%u: Sai dạng thẻ"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Gặp lỗi cú pháp %s:%u: Có rác sau giá trị"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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: Chỉ có thể thực hiện chỉ thị mức đầu"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Gặp lỗi cú pháp %s:%u: Quá nhiều chỉ thị bao gồm lồng nhau"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Gặp lỗi cú pháp %s:%u: Đã được bao gồm từ đây"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, 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:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Gặp lỗi cú pháp %s:%u: Chỉ thị “clear” thì yêu cầu một cây tuỳ chọn làm đối "
"số"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Gặp lỗi cú pháp %s:%u: Gặp rác tại kết thúc tập tin"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Không hiểu tùy chọn dòng lệnh “%c” [từ %s]."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, 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:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Tùy chọn dòng lệnh %s không phải dạng lôgíc (đúng/sai)"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Tùy chọn %s yêu cầu một đối số."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Tùy chọn %s: Đặc tả mục cấu hình phải có một “=<giá_trị>”."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "Tùy chọn %s yêu cầu một đối số kiểu số nguyên, không phải “%s”"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Tùy chọn “%s” quá dài"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "Không hiểu %s: hãy thử dùng true (đúng) hoặc false (sai)."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Thao tác “%s” không hợp lệ"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "Đang cài đặt %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "Đang cấu hình %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "Đang gỡ bỏ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "Đang gỡ bỏ hoàn toàn %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Đang ghi chép sự biến mất của %s"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Đang chạy bẫy sau-cài-đặt %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Thiếu thư mục “%s”"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Không thể mở tập tin “%s”"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "Đang chuẩn bị %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "Đang mở gói %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Đang chuẩn bị cấu hình %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "Đã cài đặt %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Đang chuẩn bị gỡ bỏ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "Đã gỡ bỏ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, 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:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "Gỡ bỏ hoàn toàn %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, c-format
+msgid "Can not write log (%s)"
+msgstr "Không thể ghi nhật ký (%s)"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr "/dev/pts đã gắn chưa?"
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "Hệ điều hành đã ngắt trước khi nó kịp hoàn thành"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+"Không ghi báo cáo apport, vì đã chạm giới hạn số các báo cáo (MaxReports)"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "gặp vấn đề về quan hệ phụ thuộc nên để lại không cấu hình"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi kế tiếp "
+"do một sự thất bại trước đó."
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “đĩa đầy”"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “không đủ "
+"bộ nhớ”"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi trên hệ "
+"thống nội bộ"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Không ghi báo cáo apport, vì thông điệp lỗi chỉ thị đây là một lỗi “V/R dpkg”"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+"Không thể khoá thư mục quản trị (%s), có một tiến trình khác đang sử dụng nó "
+"phải không?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Không thể khoá thư mục quản trị (%s), bạn có quyền root không?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+"dpkg bị ngắt giữa chừng, bạn cần phải chạy “%s” một cách thủ công để giải "
+"vấn đề này. "
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "Chưa được khoá"
+
#: 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"
@@ -3705,7 +3700,7 @@ msgstr "Đây không phải là một kho DEB hợp lệ vì còn thiếu thành
msgid "Internal error, could not locate member %s"
msgstr "Gặp lỗi nội bộ, không thể định vị thành viên %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "Tập tin điều khiển không có khả năng phân tách"
@@ -3734,23 +3729,23 @@ msgstr "Kho quá ngắn"
msgid "Failed to read the archive headers"
msgstr "Việc đọc phần đầu kho bị lỗi"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Gặp lỗi khi tạo các đường ống dẫn lệnh"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Việc thực hiện gzip bị lỗi "
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Kho bị hỏng."
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Gặp lỗi khi tổng kiểm “tar”, kho bị hỏng"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s"
@@ -3767,6 +3762,9 @@ msgstr "Không rõ kiểu phần đầu tar %u, thành viên %s"
#~ msgid "No keyring installed in %s."
#~ msgstr "Không có vòng khoá nào được cài đặt vào %s."
+#~ msgid "Is stdout a terminal?"
+#~ msgstr "Đầu ra là thiết bị cuối?"
+
#~ msgid "ioctl(TIOCGWINSZ) failed"
#~ msgstr "ioctl(TIOCGWINSZ) gặp lỗi"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index db316aebe..6e9610ac9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,14 +4,15 @@
# Tchaikov <tchaikov@sjtu.org>, 2005, 2007.
# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006.
# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
+# Zhou Mo <cdluminate@gmail.com>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: apt 0.8.0~pre1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
-"PO-Revision-Date: 2010-08-26 14:42+0800\n"
-"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
+"PO-Revision-Date: 2014-12-04 04:42+0000\n"
+"Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
@@ -24,145 +25,144 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "软件包名称总数:"
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
msgid "Total package structures: "
msgstr "全部软件包结构:"
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " 普通软件包:"
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " 完全虚拟软件包:"
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " 单虚拟软件包:"
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " 混合虚拟软件包:"
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " 缺失:"
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "按版本共计:"
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "按不同的说明共计:"
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "按依赖关系共计:"
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "按版本/文件关系共计:"
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "按说明/文件关系共计:"
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "提供映射共计:"
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "Glob 字串共计:"
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "Slack 空间共计:"
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "总占用空间:"
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "软件包文件 %s 尚未同步。"
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "没有发现匹配的软件包"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
msgid "You must give at least one search pattern"
msgstr "您必须明确地给出至少一个表达式"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr ""
+msgstr "该命令已废弃。请使用‘apt-mark showauto’代替。"
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "未发现软件包 %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "软件包文件:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "缓存尚未同步,无法交差引证(x-ref)一个软件包文件"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "被锁定的软件包:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(没有找到)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " 已安装:"
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " 候选软件包:"
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(无)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " 软件包锁:"
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " 版本列表:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s,用于 %s 构架,编译于 %s %s\n"
-#: cmdline/apt-cache.cc:1829
-#, fuzzy
+#: cmdline/apt-cache.cc:1834
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -199,15 +199,13 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
"用法: 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 是一个底层的工具,可以用来\n"
+"在 APT 的二进制缓存文件中查询信息\n"
"\n"
"命令:\n"
-" add - 向源缓存加入一个软件包文件\n"
" gencaches - 同时生成软件包和源代码包的缓存\n"
" showpkg - 显示某个软件包的全面信息\n"
" showsrc - 显示源文件的各项记录\n"
@@ -217,7 +215,6 @@ msgstr ""
" unmet - 显示所有未满足的依赖关系\n"
" search - 根据正则表达式搜索软件包列表\n"
" show - 以便于阅读的格式介绍该软件包\n"
-" showauto - 显示自动安装的软件包的列表\n"
" depends - 显示该软件包的依赖关系信息\n"
" rdepends - 显示所有依赖于该软件包的软件包名字\n"
" pkgnames - 列出所有软件包的名字\n"
@@ -235,28 +232,31 @@ msgstr ""
" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
"若要了解更多信息,您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "请给这张盘片起个名字,比如“Debian 5.0.3 Disk 1”"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "请把盘片插入驱动器再按回车键"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "无法将 %s 挂载到 %s"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
"mount point."
msgstr ""
+"从默认挂载点自动检测 CD-ROM 失败。\n"
+"您可以尝试用 --cdrom 选项来设置 CD-ROM 的挂载点。\n"
+"更多关于 CD-ROM 自动检测以及挂载点的信息,请参见‘man apt-cdrom’。"
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
@@ -288,80 +288,75 @@ msgstr ""
" dump - 显示配置文件\n"
"\n"
"选项:\n"
-" -h 本帮助文本。\n"
+" -h 显示本帮助文本。\n"
" -c=? 读取指定的配置文件\n"
" -o=? 设置任意指定的配置选项,例如:-o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:224
+#, c-format
msgid "Can not find a package for architecture '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
+msgstr "找不到‘%s’体系结构下的软件包"
-#: cmdline/apt-get.cc:322
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:311
+#, c-format
msgid "Can not find a package '%s' with version '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
+msgstr "找不到软件包‘%s’的‘%s’版本"
-#: cmdline/apt-get.cc:325
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:314
+#, c-format
msgid "Can not find a package '%s' with release '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
+msgstr "找不到软件包‘%s’的‘%s’发行"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "选择 %s 作为源代码包而非 %s\n"
-#: cmdline/apt-get.cc:418
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:414
+#, c-format
msgid "Can not find version '%s' of package '%s'"
-msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
+msgstr "找不到 %2$s 软件包的 %1$s 版本"
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
-msgstr ""
+msgstr "该命令已废弃。请用‘apt-mark auto’或‘apt-mark manual’替代。"
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "内部错误,问题解决工具坏事了"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "无法对目录 %s 加锁"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "无法锁定下载目录"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码,必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -370,164 +365,165 @@ msgstr ""
"提示:%s 的打包工作被维护于以下位置的 %s 版本控制系统中:\n"
"%s\n"
-#: cmdline/apt-get.cc:801
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:785
+#, c-format
msgid ""
"Please use:\n"
"bzr branch %s\n"
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
"请使用:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
"获得该软件包的最近更新(可能尚未正式发布)。\n"
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
-msgstr "忽略已下载过的文件“%s”\n"
+msgstr "忽略已下载的文件“%s”\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "下载完毕,目前是“仅下载”模式"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "忽略已经被解包到 %s 目录的源代码包\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr "要检查生成软件包的构建依赖关系,必须指定至少一个软件包"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
+"找不到关于 %s 的有效体系结构信息。请参见 apt.conf(5) APT::Architectures for "
+"setup"
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系信息"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:1288
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1279
+#, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
-msgstr "由于无法找到软件包 %3$s ,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
+msgstr ""
+"由于 %3$s 不被软件包 %4$s 所允许,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, 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:1329
+#: cmdline/apt-get.cc:1320
#, 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:1368
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1359
+#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"package %s can't satisfy version requirements"
msgstr ""
-"由于无法找到符合要求的软件包 %3$s 的可用版本,因此不能满足 %2$s 所要求的 "
-"%1$s 依赖关系"
+"软件包 %3$s 的候选版本不能满足版本要求,因此 %2$s 软件包的 %1$s 依赖无法满足"
-#: cmdline/apt-get.cc:1374
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1365
+#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
-msgstr "由于无法找到软件包 %3$s ,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
+msgstr "软件包 %3$s 没有可用的候选版本,因此 %2$s 的 %1$s 依赖无法满足"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系:%3$s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
-#, fuzzy, c-format
+#, c-format
msgid "Changelog for %s (%s)"
-msgstr "正在连接 %s (%s)"
+msgstr "%s (%s) 的 Changelog"
#: cmdline/apt-get.cc:1615
msgid "Supported modules:"
msgstr "支持的模块:"
#: cmdline/apt-get.cc:1656
-#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -576,7 +572,7 @@ msgstr ""
"    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"
@@ -591,10 +587,10 @@ msgstr ""
" dist-upgrade - 发布版升级,见 apt-get(8)\n"
" dselect-upgrade - 根据 dselect 的选择来进行升级\n"
" clean - 删除所有已下载的包文件\n"
-" autoclean - 删除老版本的已下载的包文件\n"
+" autoclean - 删除已下载的旧包文件\n"
" check - 核对以确认系统的依赖关系的完整性\n"
-" markauto - 标记指定的软件包为自动安装\n"
-" unmarkauto - 标记指定的软件包为手动安装\n"
+" changelog - 下载指定软件包,并显示其changelog\n"
+" download - 下载指定的二进制包到当前目录\n"
"\n"
"选项:\n"
" -h 本帮助文档。\n"
@@ -616,18 +612,17 @@ msgstr ""
#: cmdline/apt-helper.cc:36
msgid "Need one URL as argument"
-msgstr ""
+msgstr "需要一个 URL 作为参数"
#: cmdline/apt-helper.cc:49
-#, fuzzy
msgid "Must specify at least one pair url/filename"
-msgstr "要下载源代码,必须指定至少一个对应的软件包"
+msgstr "必须指定至少一对URL或者文件名"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
-msgstr ""
+msgstr "下载失败"
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -640,53 +635,64 @@ msgid ""
"\n"
" This APT helper has Super Meep Powers.\n"
msgstr ""
+"用法: apt-helper [选项] 命令\n"
+" apt-helper [选项] download-file uri target-path\n"
+"\n"
+"apt-helper 是一个 apt 的内部帮助程序\n"
+"\n"
+"命令:\n"
+" download-file - 将uri指定的文件下载到指定目标目录\n"
+" auto-detect-proxy - 用 apt.conf 检测代理设置\n"
+"\n"
+" This APT helper has Super Meep Powers.\n"
-#: cmdline/apt-mark.cc:68
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:65
+#, c-format
msgid "%s can not be marked as it is not installed.\n"
-msgstr "但是它还没有被安装"
+msgstr "%s 还没有安装,因此无法标记。\n"
-#: cmdline/apt-mark.cc:74
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:71
+#, c-format
msgid "%s was already set to manually installed.\n"
-msgstr "%s 被设置为手动安装。\n"
+msgstr "%s 已经被设置为手动安装。\n"
-#: cmdline/apt-mark.cc:76
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:73
+#, c-format
msgid "%s was already set to automatically installed.\n"
-msgstr "%s 被设置为手动安装。\n"
+msgstr "%s 已经被设置为自动安装。\n"
-#: cmdline/apt-mark.cc:241
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:238
+#, c-format
msgid "%s was already set on hold.\n"
-msgstr "%s 已经是最新的版本了。\n"
+msgstr "%s 已经设置为保留。\n"
-#: cmdline/apt-mark.cc:243
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:240
+#, c-format
msgid "%s was already not hold.\n"
-msgstr "%s 已经是最新的版本了。\n"
+msgstr "%s 已经设置为不保留。\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待子进程 %s 的退出,但是它并不存在"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
+#, c-format
msgid "%s set on hold.\n"
-msgstr "%s 已设置为手动安装。\n"
+msgstr "%s 设置为保留。\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
+#, c-format
msgid "Canceled hold on %s.\n"
-msgstr "无法打开 %s"
+msgstr "取消保留 %s 的设置。\n"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
-msgstr ""
+msgstr "执行 dpkg 失败。您是 root 吗?"
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -712,6 +718,29 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
+"用法:apt-mark [选项] {auto|manual} 软件包1 [软件包2 ...]\n"
+"\n"
+"apt-mark 是一个可以对软件包进行 手动/自动 安装标记的简单命令行界面。\n"
+"它也能列出标记。\n"
+"\n"
+"命令:\n"
+" auto - 标记指定软件包为自动安装\n"
+" manual - 标记指定软件包为手动安装\n"
+" hold - 标记指定软件包为保留(held back)\n"
+" unhold - 取消指定软件包的保留(held back)标记\n"
+" showauto - 列出所有自动安装的软件包\n"
+" showmanual - 列出所有手动安装的软件包\n"
+" showhold - 列出设为保留的软件包\n"
+"\n"
+"选项:\n"
+" -h 显示本帮助信息\n"
+" -q 日志型输出 - 不显示进度\n"
+" -qq 安静模式,只输出错误信息\n"
+" -s 无动作。只说明将要做什么。\n"
+" -f 读取/写入 指定文件的 自动/手动 标记\n"
+" -c=? 读取指定的配置文件\n"
+" -o=? 任意设置一个配置项,比如 -o dir::cache=/tmp\n"
+"更多细节请参见 the apt-mark(8) 和 apt.conf(5) 的 man 手册。"
#: cmdline/apt.cc:47
msgid ""
@@ -734,6 +763,23 @@ msgid ""
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
+"用法: apt [选项] 命令\n"
+"\n"
+"apt 的命令行界面。\n"
+"基本命令:\n"
+" list - 根据名称列出软件包\n"
+" search - 搜索软件包描述\n"
+" show - 显示软件包细节\n"
+"\n"
+" update - 更新可用软件包列表\n"
+"\n"
+" install - 安装软件包\n"
+" remove - 移除软件包\n"
+"\n"
+" upgrade - 通过 安装/升级 软件来更新系统\n"
+" full-upgrade - 通过 卸载/安装/升级 来更新系统\n"
+"\n"
+" edit-sources - 编辑软件源信息文件\n"
#: methods/cdrom.cc:203
#, c-format
@@ -906,7 +952,7 @@ msgstr "数据套接字连接超时"
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "把文件加入哈希表时出错"
@@ -981,9 +1027,9 @@ msgid "Temporary failure resolving '%s'"
msgstr "暂时不能解析域名“%s”"
#: methods/connect.cc:209
-#, fuzzy, c-format
+#, c-format
msgid "System error resolving '%s:%s'"
-msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
+msgstr "解析“%s:%s”时出现系统故障"
#: methods/connect.cc:211
#, c-format
@@ -995,36 +1041,36 @@ msgstr "解析“%s:%s”时,出现了某些故障(%i - %s)"
msgid "Unable to connect to %s:%s:"
msgstr "不能连接到 %s:%s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "内部错误:签名正确无误,但是无法确认密钥指纹?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "至少发现一个无效的签名。"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr "无法运行 apt-key 以验证签名(您安装了 gnupg 吗?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
-msgstr ""
+msgstr "明文签署文件不可用,结果为‘%s’(您的网络需要认证吗?)"
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "运行 apt-key 时发生未知错误"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "下列签名无效:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1032,33 +1078,33 @@ msgstr "由于没有公钥,无法验证下列签名:\n"
#: methods/gzip.cc:79
msgid "Empty files can't be valid archives"
-msgstr ""
+msgstr "空文件不能当作有效归档"
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "写入文件出错"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错,对方关闭了连接"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "写入文件出错"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "连接超时"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "写输出文件时出错"
@@ -1066,52 +1112,291 @@ msgstr "写输出文件时出错"
msgid "Waiting for headers"
msgstr "正在等待报头"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "错误的报头行"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "该 HTTP 服务器发送了一个无效的应答报头"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "该 HTTP 服务器的 range 支持不正常"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "连接失败"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "内部错误"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr "正在列表"
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] "还有 %i 个版本。请使用 -a 选项来查看它(他们)。"
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "正在更正依赖关系..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " 失败。"
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "无法更正依赖关系"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "无法最小化要升级的软件包集合"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " 完成"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr "未知"
+
+#: apt-private/private-output.cc:265
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "[已安装,可升级至:%s]"
+
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr "[已安装,本地]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr "[已安装,可自动卸载]"
+
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr "[已安装,自动]"
+
+#: apt-private/private-output.cc:274
+msgid "[installed]"
+msgstr "[已安装]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr "[可从该版本升级:%s]"
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr "[配置文件残留]"
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "但是 %s 已经安装"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "但是 %s 正要被安装"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "但无法安装它"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "但是它是虚拟软件包"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "但是它还没有被安装"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "但是它将不会被安装"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " 或"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "下列软件包有未满足的依赖关系:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "下列【新】软件包将被安装:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "下列软件包将被【卸载】:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "下列软件包的版本将保持不变:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "下列软件包将被升级:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "下列软件包将被【降级】:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "下列被要求保持版本不变的软件包将被改变:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (是由于 %s) "
+
+#: apt-private/private-output.cc:696
+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"
+"请勿尝试,除非您确实知道您在做什么!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "升级了 %lu 个软件包,新安装了 %lu 个软件包,"
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "重新安装了 %lu 个软件包,"
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "降级了 %lu 个软件包,"
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "要卸载 %lu 个软件包,有 %lu 个软件包未被升级。\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "Y"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "编译正则表达式时出错 - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr " update 命令不需要参数"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+"有 %i 个软件包可以升级。请执行 ‘apt list --upgradable’ 来查看它们。\n"
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr "所有软件包均为最新。"
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
+msgstr "正在排序"
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] "有 %i 条附加记录。请加上 ‘-a’ 参数来查看它们"
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr "不是一个实包(虚包)"
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
msgstr ""
+"注意:这只是模拟!\n"
+"   apt-get 需要 root 特权进行实际的执行。\n"
+"   同时请记住此时并未锁定,所以请勿完全相信当前的情况!"
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
@@ -1271,10 +1556,9 @@ msgid_plural ""
msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"
#: apt-private/private-install.cc:494
-#, fuzzy
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "使用'apt-get autoremove'来卸载它们"
+msgstr[0] "使用'apt-get autoremove'来卸载它(它们)。"
#: apt-private/private-install.cc:587
msgid "You might want to run 'apt-get -f install' to correct these:"
@@ -1333,7 +1617,7 @@ msgstr "不能重新安装 %s,因为无法下载它。\n"
#: apt-private/private-install.cc:844
#, c-format
msgid "%s is already the newest version.\n"
-msgstr "%s 已经是最新的版本了。\n"
+msgstr "%s 已经是最新的版本。\n"
#: apt-private/private-install.cc:892
#, c-format
@@ -1341,262 +1625,21 @@ msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
#: apt-private/private-install.cc:897
-#, fuzzy, c-format
+#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
+msgstr "由于 %4$s,为 %3$s 选定了版本 %1$s (%2$s)\n"
#. TRANSLATORS: Note, this is not an interactive question
#: apt-private/private-install.cc:939
-#, fuzzy, c-format
+#, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "软件包 %s 还未安装,因而不会被卸载\n"
+msgstr "软件包 %s 还未安装,因而不会被卸载。您的意思是 ‘%s’ 吗?\n"
#: apt-private/private-install.cc:945
-#, fuzzy, c-format
+#, c-format
msgid "Package '%s' is not installed, so not removed\n"
msgstr "软件包 %s 还未安装,因而不会被卸载\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "正在更正依赖关系..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " 失败。"
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "无法更正依赖关系"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "无法最小化要升级的软件包集合"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " 完成"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [已安装]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [已安装]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [已安装]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [已安装]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "但是 %s 已经安装"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "但是 %s 正要被安装"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "但无法安装它"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "但是它是虚拟软件包"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "但是它还没有被安装"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "但是它将不会被安装"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " 或"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "下列软件包有未满足的依赖关系:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "下列【新】软件包将被安装:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "下列软件包将被【卸载】:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "下列软件包的版本将保持不变:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "下列软件包将被升级:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "下列软件包将被【降级】:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "下列被要求保持版本不变的软件包将被改变:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (是由于 %s) "
-
-#: apt-private/private-output.cc:696
-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"
-"请勿尝试,除非您确实知道您在做什么!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "升级了 %lu 个软件包,新安装了 %lu 个软件包,"
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "重新安装了 %lu 个软件包,"
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "降级了 %lu 个软件包,"
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "要卸载 %lu 个软件包,有 %lu 个软件包未被升级。\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "编译正则表达式时出错 - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr " update 命令不需要参数"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-"注意:这只是模拟!\n"
-"   apt-get 需要 root 特权进行实际的执行。\n"
-"   同时请记住此时并未锁定,所以请勿完全相信当前的情况!"
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1636,34 +1679,38 @@ msgid "You don't have enough free space in %s."
msgstr "您在 %s 上没有足够的可用空间。"
#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
+#, c-format
msgid "Failed to parse %s. Edit again? "
-msgstr "无法将 %s 重命名为 %s"
+msgstr "解析 %s 失败。请重新编辑之后再试。"
#: apt-private/private-sources.cc:70
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
-msgstr ""
+msgstr "您的 %s 文件有过改动,请执行 ‘apt-get update’。"
#: apt-private/private-search.cc:69
msgid "Full Text Search"
-msgstr ""
+msgstr "全文搜索"
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "命中 "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "命中:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "获取:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "获取:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "忽略 "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "忽略:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "错误 "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "错误:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1689,17 +1736,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "无法读取 %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1715,14 +1762,14 @@ msgstr "没有找到镜像文件 %s"
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
#: methods/mirror.cc:287
-#, fuzzy, c-format
+#, c-format
msgid "Can not read mirror file '%s'"
-msgstr "没有找到镜像文件 %s"
+msgstr "无法读取镜像文件 %s"
#: methods/mirror.cc:315
-#, fuzzy, c-format
+#, c-format
msgid "No entry found in mirror file '%s'"
-msgstr "没有找到镜像文件 %s"
+msgstr "在镜像文件 %s 中未找到所需条目"
#: methods/mirror.cc:445
#, c-format
@@ -1771,7 +1818,7 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们,
msgid "Merging available information"
msgstr "正在合并可用信息"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1795,46 +1842,46 @@ msgstr ""
" -c=? 读指定的配置文件\n"
" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
-#, fuzzy, c-format
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#, c-format
msgid "Unable to mkstemp %s"
-msgstr "无法读取 %s 的状态"
+msgstr "无法建立临时文件(mkstemp) %s "
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "无法写入 %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "软件包的扩展列表太长"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "处理目录 %s 时出错"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "源扩展列表太长"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "将头写入到目录文件时出错"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "处理目录 %s 时出错"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1914,11 +1961,11 @@ msgstr ""
" -c=? 读取指定配置文件\n"
" -o=? 设置任意指定的配置选项"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "没有任何选定项是匹配的"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "软件包文件组“%s”中缺少一些文件"
@@ -1952,9 +1999,8 @@ msgid "Failed to stat %s"
msgstr "无法获得 %s 的状态"
#: ftparchive/cachedb.cc:326
-#, fuzzy
msgid "Failed to read .dsc"
-msgstr "无法读取符号链接 %s"
+msgstr "读取 .dsc 文件失败"
#: ftparchive/cachedb.cc:359
msgid "Archive has no control record"
@@ -2029,22 +2075,22 @@ msgstr " 达到了 DeLink 的上限 %sB。\n"
msgid "Archive had no package field"
msgstr "归档文件没有包含 package 字段"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 中没有 override 项\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s 并非 %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 没有源代码的 override 项\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 中没有二进制文件的 override 项\n"
@@ -2061,9 +2107,9 @@ msgstr "无法打开 %s"
#. skip spaces
#. find end of word
#: ftparchive/override.cc:68
-#, fuzzy, c-format
+#, c-format
msgid "Malformed override %s line %llu (%s)"
-msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
+msgstr "override 文件 %s 第 %llu (%s) 行的格式有误"
#: ftparchive/override.cc:127 ftparchive/override.cc:201
#, c-format
@@ -2071,19 +2117,19 @@ msgid "Failed to read the override file %s"
msgstr "无法读取 override 文件 %s"
#: ftparchive/override.cc:166
-#, fuzzy, c-format
+#, c-format
msgid "Malformed override %s line %llu #1"
-msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
+msgstr "override 文件 %s 第 %llu 行的格式有误 #1"
#: ftparchive/override.cc:178
-#, fuzzy, c-format
+#, c-format
msgid "Malformed override %s line %llu #2"
-msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
+msgstr "override 文件 %s 第 %llu 行的格式有误 #2"
#: ftparchive/override.cc:191
-#, fuzzy, c-format
+#, c-format
msgid "Malformed override %s line %llu #3"
-msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
+msgstr "override 文件 %s 第 %llu 行的格式有误 #3"
#: ftparchive/multicompress.cc:73
#, c-format
@@ -2130,8 +2176,7 @@ msgstr "在使用 unlink 删除 %s 时出错"
msgid "Failed to rename %s to %s"
msgstr "无法将 %s 重命名为 %s"
-#: cmdline/apt-internal-solver.cc:49
-#, fuzzy
+#: cmdline/apt-internal-solver.cc:51
msgid ""
"Usage: apt-internal-solver\n"
"\n"
@@ -2144,22 +2189,22 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"用法: apt-extracttemplates 文件甲 [文件乙 ...]\n"
+"用法: apt-internal-solver\n"
"\n"
-"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
-"信息的工具\n"
+"apt-internal-solver 是个用于调试及类似用途的接口,它可以\n"
+"像 APT 家族外部解决器(resolver)那样使用当前的内部解决器。\n"
"\n"
"选项:\n"
-" -h 本帮助文本\n"
-" -t 设置 temp 目录\n"
-" -c=? 读指定的配置文件\n"
-" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
+" -h 显示本帮助。\n"
+" -q 日志型输出 - 无进度指示\n"
+" -c=? 读取指定配置文件\n"
+" -o=? 设置任意配置项,比如 -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "未知的软件包记录!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2186,7 +2231,7 @@ msgstr ""
#: apt-pkg/install-progress.cc:59
#, c-format
msgid "Progress: [%3i%%]"
-msgstr ""
+msgstr "进度:[%3i%%]"
#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
msgid "Running dpkg"
@@ -2231,6 +2276,26 @@ msgstr "无法找到认证记录:%s"
msgid "Hash mismatch for: %s"
msgstr "Hash 校验和不符:%s"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
+
+#: apt-pkg/acquire-worker.cc:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr "请检查是否安装了 %s 软件包"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "无法解析或打开软件包的列表或是状态文件。"
@@ -2243,176 +2308,295 @@ msgstr "您可能需要运行 apt-get update 来解决这些问题"
msgid "The list of sources could not be read."
msgstr "无法读取源列表。"
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "软件包缓存区是空的"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "软件包缓存文件损坏了"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "软件包缓存区文件的版本不兼容"
-#: apt-pkg/pkgcache.cc:163
-#, fuzzy
+#: apt-pkg/pkgcache.cc:168
msgid "The package cache file is corrupted, it is too small"
-msgstr "软件包缓存文件损坏了"
+msgstr "软件包缓存文件损坏,它太小了"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "本程序目前不支持“%s”版本系统"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "软件包缓存区是为其它架构的硬件构建的"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "依赖"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "预依赖"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "建议"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "推荐"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "冲突"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "替换"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "废弃"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "破坏"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr "增强"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "重要"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "必需"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "标准"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "可选"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "额外"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "正在对升级进行计算"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
+msgid "Index file type '%s' is not supported"
+msgstr "不支持索引文件类型“%s”"
-#: apt-pkg/acquire-worker.cc:135
-#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
+#: apt-pkg/sourcelist.cc:127
+#, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "安装源配置文件“%2$s”第 %1$u 节有错误(URI 解析)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "不支持索引文件类型“%s”"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "正在分析软件包的依赖关系树"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)"
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "候选版本"
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "生成依赖关系"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "正在读取状态信息"
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "无法打开状态文件 %s"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:217
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "无法写入临时状态文件 %s"
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "正在打开 %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "源列表 %2$s 的第 %1$u 行太长了。"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
+
+#: apt-pkg/sourcelist.cc:375
+#, 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:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "无法识别在源列表 %3$s 里,第 %2$u 节中的软件包类别“%1$s”"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr "%s 的 Clean (清理)不被支持"
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "无法读取 %s 的状态。"
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "软件包暂存区使用的是不兼容的版本控制系统"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "处理 %s (%s%d) 时出错"
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "哇,软件包数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "哇,软件包版本数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "哇,软件包说明数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "哇,依赖关系数量超出了本 APT 的处理能力。"
+
+#: apt-pkg/pkgcachegen.cc:591
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "当处理文件依赖关系时,无法找到软件包 %s %s"
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "无法获取源软件包列表 %s 的状态"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "正在读取软件包列表"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "正在收集文件所提供的软件包"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "无法读取或写入软件源缓存"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr "向solver发送情景"
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr "向solver发送请求"
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr "准备接收解决方案"
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr "外部solver出错,错误信息不恰当"
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr "执行外部solver"
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Hash 校验和不符"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/acquire-item.cc:255
-#, fuzzy
+#: apt-pkg/acquire-item.cc:250
msgid "Invalid file format"
-msgstr "无效的操作 %s"
+msgstr "无效的文件格式 %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "写出错"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2421,7 +2605,7 @@ msgstr ""
"校验签名出错。此仓库未被更新,仍然使用以前的索引文件。GPG 错误:%s: %s\n"
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr "GPG 错误:%s: %s"
@@ -2437,49 +2621,51 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
+"在 Release 文件中找不到期望的条目 %s(sources.list条目有误,或者文件有误)"
-#: apt-pkg/acquire-item.cc:1971
-#, fuzzy, c-format
+#: apt-pkg/acquire-item.cc:1975
+#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "无法解析软件包仓库 Release 文件 %s"
+msgstr "在 Release 文件中找不到 %s 的哈希值"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "以下 ID 的密钥没有可用的公钥:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
+"%s 的 Release 文件已经过期(invalid since %s)。该仓库的更新将不会被应用。"
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "冲突的发行版:%s (期望 %s 但得到 %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2488,129 +2674,60 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+msgstr "没有源可以用来下载 %s 版本的 %s"
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "软件包暂存区使用的是不兼容的版本控制系统"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "处理 %s (FindPkg)时出错"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "哇,软件包数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "哇,软件包版本数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "哇,软件包说明数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "哇,依赖关系数量超出了本 APT 的处理能力。"
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "当处理文件依赖关系时,无法找到软件包 %s %s"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "无法获取源软件包列表 %s 的状态"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "正在读取软件包列表"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "正在收集文件所提供的软件包"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "无法读取或写入软件源缓存"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "软件提供者数据块内 %s 没有包含指纹信息"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, c-format
msgid "List directory %spartial is missing."
msgstr "软件包列表的目录 %spartial 缺失。"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, c-format
msgid "Archives directory %spartial is missing."
msgstr "仓库目录 %spartial 确实。"
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "不支持索引文件类型“%s”"
+#: apt-pkg/acquire.cc:162
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "无法对目录 %s 加锁"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "正在下载第 %li 个文件,共 %li 个(还剩 %s 个)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "正在下载第 %li 个文件,共 %li 个"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"有一些索引文件不能下载,它们可能被忽略了,也可能转而使用了旧的索引文件。"
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "无法读取 %s 的状态。"
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
"The value '%s' is invalid for APT::Default-Release as such a release is not "
"available in the sources"
msgstr ""
+"'%s' 这个值对 APT::Default-Release 是无效的,因为在源里找不到这样的发行"
#: apt-pkg/policy.cc:422
#, c-format
@@ -2626,7 +2743,7 @@ msgstr "无法识别锁定的类型 %s"
msgid "No priority (or zero) specified for pin"
msgstr "没有为版本锁定指定优先级(或为零)"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2635,12 +2752,12 @@ msgstr ""
"无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure "
"(%d)"
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
-#, fuzzy, c-format
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
+#, c-format
msgid "Could not configure '%s'. "
-msgstr "无法打开文件 %s"
+msgstr "无法配置 %s。"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2651,10 +2768,11 @@ msgstr ""
"少的软件包 %s。通常并不建议这样做,但是如果您确实希望如此,可以打开 APT::"
"Force-LoopBreak 选项。"
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "源列表 %2$s 的第 %1$u 行太长了。"
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr "部分索引文件下载失败。如果忽略它们,那将转而使用旧的索引文件。"
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2725,11 +2843,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "正在复制软件包列表……"
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "正在写入新的源列表\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "对应于该盘片的软件源设置项是:\n"
@@ -2739,7 +2857,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "软件包 %s 需要重新安装,但是我无法找到相应的安装文件。"
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2747,141 +2865,42 @@ msgstr ""
"错误,pkgProblemResolver::Resolve 发生故障,这可能是有软件包被要求保持现状的"
"缘故。"
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"无法修正错误,因为您要求某些软件包保持现状,就是它们破坏了软件包间的依赖关"
"系。"
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "无法解析软件包文件 %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "无法解析软件包文件 %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "无法解析软件包仓库 Release 文件 %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)"
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "正在分析软件包的依赖关系树"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候选版本"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "生成依赖关系"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "正在读取状态信息"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "正在打开 %s"
+msgid "Failed to open StateFile %s"
+msgstr "无法打开状态文件 %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "无法写入临时状态文件 %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, 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:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "无法识别在源列表 %3$s 里,第 %2$u 行中的软件包类别“%1$s”"
+msgid "Unable to parse package file %s (%d)"
+msgstr "无法解析软件包文件 %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2893,209 +2912,101 @@ msgstr "未找到“%2$s”的“%1$s”发布版本"
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, c-format
msgid "Couldn't find task '%s'"
msgstr "无法找到任务 %s"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "无法按照正则表达式 %s 找到任何软件包"
-#: apt-pkg/cacheset.cc:646
-#, fuzzy, c-format
+#: apt-pkg/cacheset.cc:641
+#, c-format
msgid "Couldn't find any package by glob '%s'"
-msgstr "无法按照正则表达式 %s 找到任何软件包"
+msgstr "无法按照 glob ‘%s’ 找到任何软件包"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr "无法从完全虚拟的软件包 %s 中选择版本"
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr "因为软件包 %s 是完全的虚拟软件包,无法选择它的最新版"
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr "因为软件包 %s 没有候选版本,无法进行选择"
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr "因为软件包 %s 没有安装,无法选择它的已安装版本"
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr "因为软件包 %s 没有已安装或候选的版本,无法进行选择"
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr "正在安装 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr "正在配置 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr "正在删除 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr "完全删除 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "注意到 %s 已经消失"
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "执行安装后执行的触发器 %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "目录 %s 缺失"
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "无法打开文件 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "正在准备 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Unpacking %s"
-msgstr "正在解压缩 %s"
+msgid "Unable to parse Release file %s"
+msgstr "无法解析软件包仓库 Release 文件 %s"
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Preparing to configure %s"
-msgstr "正在准备配置 %s"
+msgid "No sections in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Installed %s"
-msgstr "已安装 %s"
+msgid "No Hash entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:145
#, c-format
-msgid "Preparing for removal of %s"
-msgstr "正在准备 %s 的删除操作"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:164
#, c-format
-msgid "Removed %s"
-msgstr "已删除 %s"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
-#: apt-pkg/deb/dpkgpm.cc:1024
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "正在准备完全删除 %s"
+msgid "%lid %lih %limin %lis"
+msgstr "%li天 %li小时 %li分 %li秒"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Completely removed %s"
-msgstr "完全删除了 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "无法写入 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr "由于已经达到 MaxReports 限制,没有写入 apport 报告。"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr "依赖问题 - 保持未配置"
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr "因为错误消息指示这是由于上一个问题导致的错误,没有写入 apport 报告。"
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。"
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr "因为错误消息指示这是由于内存不足,没有写入 apport 报告。"
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-#, fuzzy
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。"
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr "因为错误消息指示这是一个 dpkg I/O 错误,没有写入 apport 报告。"
+msgid "%lih %limin %lis"
+msgstr "%li小时 %li分 %li秒"
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr "无法锁定管理目录(%s),是否有其他进程正占用它?"
+msgid "%limin %lis"
+msgstr "%li分 %li秒"
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "无法对状态列表目录加锁(%s),请查看您是否正以 root 用户运行?"
+msgid "%lis"
+msgstr "%li秒"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg 被中断,您必须手工运行 %s 解决此问题。"
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr "未锁定"
+msgid "Selection %s not found"
+msgstr "找不到您选则的 %s"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3120,23 +3031,23 @@ msgstr "无法获得锁 %s"
#: apt-pkg/contrib/fileutl.cc:366 apt-pkg/contrib/fileutl.cc:480
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgstr "无法创建文件列表,因为‘%s’不是一个目录"
#: apt-pkg/contrib/fileutl.cc:400
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgstr "忽略‘%s’(于目录‘%s’),鉴于它不是一个常规文件"
#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
+msgstr "忽略‘%s’(于目录‘%s’),鉴于它没有文件扩展名"
#: apt-pkg/contrib/fileutl.cc:427
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
+msgstr "忽略‘%s’(于目录‘%s’),鉴于它的文件扩展名无效"
#: apt-pkg/contrib/fileutl.cc:846
#, c-format
@@ -3182,14 +3093,14 @@ msgid "Failed to exec compressor "
msgstr "无法执行压缩程序"
#: apt-pkg/contrib/fileutl.cc:1553
-#, fuzzy, c-format
+#, c-format
msgid "read, still have %llu to read but none left"
-msgstr "读取文件出错,还剩 %lu 字节没有读出"
+msgstr "还剩 %llu 字节没有读出,但已没有可读信息"
#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
-#, fuzzy, c-format
+#, c-format
msgid "write, still have %llu to write but couldn't"
-msgstr "写入文件出错,还剩 %lu 字节没有保存"
+msgstr "还剩 %llu 字节没有写入,但无法写入操作"
#: apt-pkg/contrib/fileutl.cc:1954
#, c-format
@@ -3222,42 +3133,13 @@ msgstr "%c%s... 完成"
#: apt-pkg/contrib/progress.cc:181
msgid "..."
-msgstr ""
+msgstr "..."
#. Print the spinner
#: apt-pkg/contrib/progress.cc:197
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... 完成"
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li天 %li小时 %li分 %li秒"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li小时 %li分 %li秒"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr "%li分 %li秒"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr "%li秒"
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "找不到您选则的 %s"
+msgid "%c%s... %u%%"
+msgstr "%c%s... %u%%"
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
@@ -3269,9 +3151,9 @@ msgid "Couldn't duplicate file descriptor %i"
msgstr "无法为复制文件描述符 %i"
#: apt-pkg/contrib/mmap.cc:119
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't make mmap of %llu bytes"
-msgstr "无法 mmap %lu 字节的数据"
+msgstr "无法 mmap %llu 字节的数据"
#: apt-pkg/contrib/mmap.cc:146
msgid "Unable to close mmap"
@@ -3320,107 +3202,263 @@ msgstr "无法读取文件系统挂载点 %s 的状态"
msgid "Failed to stat the cdrom"
msgstr "无法读取盘片的状态"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "无法识别的类型缩写:“%c”"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "正在打开配置文件 %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "语法错误 %s:%u:配置小节没有以名字开头"
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "语法错误 %s:%u:标签格式有误"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "语法错误 %s:%u:配置值后有多余的无意义数据"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "语法错误 %s:%u:只能在顶层配置文件中使用指示"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "语法错误 %s:%u:太多的嵌套 include 命令"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "语法错误 %s:%u:Included from here"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "语法错误 %s:%u:不支持的指令“%s”"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "语法错误 %s:%u:clean 指令需要一个选项树作为参数"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "语法错误 %s:%u:文件尾部有多余的无意义的数据"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "未知的命令行选项“%c” [来自 %s]"
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "无法识别命令行选项 %s"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "命令行选项 %s 不是布尔值"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "选项 %s 要求有一个参数"
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "选项 %s:配置项后必须包含有形如“=<变量>”的具体指定"
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "选项 %s 要求有一个整数作为参数,而不是“%s”"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "选项“%s”太长"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "不能识别参数 %s,请用 true 或 false"
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "无效的操作 %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "正在安装 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "正在配置 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "正在删除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr "完全删除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "注意到 %s 已经消失"
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "执行安装后执行的触发器 %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "目录 %s 缺失"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "无法打开文件 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "正在准备 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "正在解压缩 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "正在准备配置 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "已安装 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "正在准备 %s 的删除操作"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "已删除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "正在准备完全删除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "完全删除了 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, c-format
+msgid "Can not write log (%s)"
+msgstr "无法写入日志 (%s)"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr "/dev/pts 挂载了吗?"
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr "操作在完成之前被打断"
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr "由于已经达到 MaxReports 限制,没有写入 apport 报告。"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr "依赖问题 - 保持未配置"
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr "因为错误消息指示这是由于上一个问题导致的错误,没有写入 apport 报告。"
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr "因为错误消息指示这是由于磁盘已满,没有写入 apport 报告。"
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr "因为错误消息指示这是由于内存不足,没有写入 apport 报告。"
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr "错误信息显示本地系统有一些问题,因此没有写入 apport 报告"
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr "因为错误消息指示这是一个 dpkg I/O 错误,没有写入 apport 报告。"
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr "无法锁定管理目录(%s),是否有其他进程正占用它?"
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "无法对状态列表目录加锁(%s),请查看您是否正以 root 用户运行?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg 被中断,您必须手工运行 ‘%s’ 解决此问题。"
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr "未锁定"
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "把 DropNode 用在了仍在链表中的节点上"
@@ -3525,7 +3563,7 @@ msgstr "这不是一个有效的 DEB 包文件,其包内遗漏了“%s”"
msgid "Internal error, could not locate member %s"
msgstr "内部错误,无法定位包内文件 %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "不能解析的主控文件"
@@ -3554,23 +3592,23 @@ msgstr "归档文件太短"
msgid "Failed to read the archive headers"
msgstr "无法读取归档文件的数据头"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "无法创建管道"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "无法执行 gzip"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "包文件已被损坏"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar 的校验和不符,文件已损坏"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "未知的 TAR 数据头类型 %u,成员 %s"
@@ -3587,6 +3625,9 @@ msgstr "未知的 TAR 数据头类型 %u,成员 %s"
#~ msgid "No keyring installed in %s."
#~ msgstr "%s 中没有安装密钥环。"
+#~ msgid "Is stdout a terminal?"
+#~ msgstr "stdout 是终端吗?"
+
#, fuzzy
#~ msgid "Internal error, Upgrade broke stuff"
#~ msgstr "内部错误,全部升级工具坏事了"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a1ced2f71..201d9d675 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.5.4\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
"PO-Revision-Date: 2009-01-28 10:41+0800\n"
"Last-Translator: Tetralet <tetralet@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -23,146 +23,146 @@ msgstr ""
msgid "Package %s version %s has an unmet dep:\n"
msgstr "套件 %s 版本 %s 未能滿足相依性:\n"
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
msgid "Total package names: "
msgstr "套件名稱合計:"
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid "Total package structures: "
msgstr "套件名稱合計:"
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
msgid " Normal packages: "
msgstr " 一般套件:"
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
msgid " Pure virtual packages: "
msgstr " 完全虛擬套件:"
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
msgid " Single virtual packages: "
msgstr " 單一虛擬套件:"
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
msgid " Mixed virtual packages: "
msgstr " 混合虛擬套件:"
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " 找不到:"
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
msgid "Total distinct versions: "
msgstr "個別版本合計:"
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
msgid "Total distinct descriptions: "
msgstr "個別版本類別合計:"
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
msgid "Total dependencies: "
msgstr "相依關係合計:"
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
msgid "Total ver/file relations: "
msgstr "版本/檔案關聯合計:"
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
msgid "Total Desc/File relations: "
msgstr "類別/檔案關聯合計:"
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
msgid "Total Provides mappings: "
msgstr "提供者對應合計:"
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
msgid "Total globbed strings: "
msgstr "所有字串合計:"
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
msgid "Total slack space: "
msgstr "間暇空間合計:"
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
msgid "Total space accounted for: "
msgstr "統計後的空間合計:"
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "套件檔 %s 未同步。"
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "未找到套件"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
#, fuzzy
msgid "You must give at least one search pattern"
msgstr "您必須明確得給定一個樣式"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "找不到套件 %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
msgid "Package files:"
msgstr "套件檔:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "快取資料未同步,無法 x-ref 套件檔"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
msgid "Pinned packages:"
msgstr "鎖定的套件:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(未找到)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " 已安裝:"
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " 候選:"
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(無)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
msgid " Package pin: "
msgstr " 套件鎖定:"
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
msgid " Version table:"
msgstr " 版本列表:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s 是用於 %s 並在 %s %s 上編譯的\n"
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -235,21 +235,21 @@ msgstr ""
" -o=? 指定任意的設定選項,例如:-o dir::cache=/tmp\n"
"請參閱 apt-cache(8) 及 apt.conf(5) 參考手冊以取得更多資訊。\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr "請替這張光碟取個名字,像是 'Debian 2.1r1 Disk 1'"
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "請把光碟放入光碟機,然後按下 [Enter] 鍵"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "無法將 %s 更名為 %s"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -257,7 +257,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr "請對您的光碟組中的其它光碟重複相同的操作。"
@@ -293,83 +293,78 @@ msgstr ""
" -c=? 讀取指定的設定檔\n"
" -o=? 指定任意的設定選項,例如:-o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "無法找到套件 %s"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "無法找到套件 %s"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "無法找到套件 %s"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "無法取得來源套件列表 %s 的狀態"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "無法找到套件 %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被設定為手動安裝。\n"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "%s 被設定為手動安裝。\n"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
msgid "Internal error, problem resolver broke stuff"
msgstr "內部錯誤,問題排除器造成了損壞"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "無法鎖定列表目錄"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "無法鎖定下載目錄"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
msgid "Must specify at least one package to fetch source for"
msgstr "在取得原始碼時必須至少指定一個套件"
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "無法找到 %s 的原始碼套件"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -377,113 +372,113 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "略過已下載的檔案 '%s'\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下載 %sB/%sB 的原始套件檔。\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下載 %sB 的原始套件檔。\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, c-format
msgid "Fetch source %s\n"
msgstr "取得原始碼 %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "無法取得某些套件檔。"
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "下載完成,且這是『僅下載』模式"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "不解開,因原始碼已解開至 %s\n"
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "解開指令 '%s' 失敗。\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "編譯指令 '%s' 失敗。\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "子程序失敗"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
msgid "Must specify at least one package to check builddeps for"
msgstr "在檢查編譯相依關係時必須至少指定一個套件"
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "無法處理編譯相依關係"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "無法取得 %s 的編譯相依關係資訊"
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 沒有編譯相依關係。\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"packages"
msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係,因為找不到套件 %3$s"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係,因為找不到套件 %3$s"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, 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:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -491,24 +486,24 @@ msgid ""
msgstr ""
"無法滿足 %2$s 所要求的 %1$s 相依關係,因為套件 %3$s 沒有版本符合其版本需求"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"version"
msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係,因為找不到套件 %3$s"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "無法滿足 %2$s 的相依關係 %1$s:%3$s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "無法滿足套件 %s 的編譯相依關係。"
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "無法處理編譯相依關係"
@@ -616,11 +611,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "在取得原始碼時必須至少指定一個套件"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -634,52 +629,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "但它卻尚未安裝"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "%s 被設定為手動安裝。\n"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "%s 被設定為手動安裝。\n"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "%s 已經是最新版本了。\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "%s 已經是最新版本了。\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr "等待 %s 但是它並不存在"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "%s 被設定為手動安裝。\n"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "無法開啟 %s"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -898,7 +894,7 @@ msgstr "Data socket 連線逾時"
msgid "Unable to accept connection"
msgstr "無法接受連線"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "有問題的雜湊檔"
@@ -987,36 +983,37 @@ msgstr "在解析 '%s:%s' (%i) 時出了怪事"
msgid "Unable to connect to %s:%s:"
msgstr "無法連線至 %s %s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr "內部錯誤:簽章無誤,但卻無法辨識密鑰的指紋碼?!"
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr "至少發現一個無效的簽章。"
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
+#, fuzzy
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
-msgstr "無法執行 'apt-key' 來驗證簽章(gnupg 是否安裝了?)"
+msgstr "無法執行 '%s' 來驗證簽章(gnupg 是否安裝了?)"
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr "在執行 apt-key 時發生未知的錯誤"
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
msgid "The following signatures were invalid:\n"
msgstr "以下簽名無效:\n"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1026,31 +1023,31 @@ msgstr "由於無法取得它們的公鑰,以下簽章無法進行驗證:\n"
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "在寫入該檔時發生錯誤"
-#: methods/http.cc:529
+#: methods/http.cc:531
msgid "Error reading from server. Remote end closed connection"
msgstr "在讀取伺服器時發生錯誤,遠端主機已關閉連線"
-#: methods/http.cc:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "在讀取伺服器時發生錯誤"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "在寫入檔案時發生錯誤"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "選擇失敗"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "連線逾時"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "在寫入輸出檔時發生錯誤"
@@ -1058,53 +1055,294 @@ msgstr "在寫入輸出檔時發生錯誤"
msgid "Waiting for headers"
msgstr "等待標頭"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "標頭行錯誤"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP 伺服器傳送了一個無效的回覆標頭"
-#: methods/server.cc:172
+#: methods/server.cc:173
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP 伺服器傳送了一個無效的 Content-Length 標頭"
-#: methods/server.cc:195
+#: methods/server.cc:193
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP 伺服器傳送了一個無效的 Content-Range 標頭"
-#: methods/server.cc:197
+#: methods/server.cc:195
msgid "This HTTP server has broken range support"
msgstr "這個 HTTP 伺服器的範圍支援有問題"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "未知的資料格式"
-#: methods/server.cc:497
+#: methods/server.cc:506
msgid "Bad header data"
msgstr "錯誤的標頭資料"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "連線失敗"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "內部錯誤"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "正在修正相依關係..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " 失敗。"
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "無法修正相依關係"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "無法將升級計劃最小化"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " 完成"
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。"
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "未能滿足相依關係。試試 -f 選項。"
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr "【已安裝】"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr "【已安裝】"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr "【已安裝】"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr "【已安裝】"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "但 %s 卻已安裝"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "但 %s 卻將被安裝"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "但它卻無法安裝"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "但它是虛擬套件"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "但它卻尚未安裝"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "但它卻將不會被安裝"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr "或"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "下列的套件有未滿足的相依關係:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "下列【新】套件將會被安裝:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "下列套件將會被【移除】:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "下列套件將會維持其原有版本:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "下列套件將會被升級:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "下列套件將會被【降級】:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "下列被保留 (hold) 的套件將會被更改:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s(因為 %s)"
+
+#: apt-private/private-output.cc:696
+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"
+"除非您很清楚您在做什麼,否則請勿輕易嘗試!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "升級 %lu 個,新安裝 %lu 個,"
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "重新安裝 %lu 個,"
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "降級 %lu 個,"
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "移除 %lu 個,有 %lu 個未被升級。\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu 個沒有完整得安裝或移除。\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "編譯正規表示式時發生錯誤 - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "update 指令不需任何參數"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "內部錯誤,在損毀的套件上執行 InstallPackages!"
@@ -1355,247 +1593,6 @@ msgstr "套件 %s 並沒有被安裝,所以也不會被移除\n"
msgid "Package '%s' is not installed, so not removed\n"
msgstr "套件 %s 並沒有被安裝,所以也不會被移除\n"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "正在修正相依關係..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " 失敗。"
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "無法修正相依關係"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "無法將升級計劃最小化"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " 完成"
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。"
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "未能滿足相依關係。試試 -f 選項。"
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr "【已安裝】"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr "【已安裝】"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr "【已安裝】"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr "【已安裝】"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "但 %s 卻已安裝"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "但 %s 卻將被安裝"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "但它卻無法安裝"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "但它是虛擬套件"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "但它卻尚未安裝"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "但它卻將不會被安裝"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr "或"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "下列的套件有未滿足的相依關係:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "下列【新】套件將會被安裝:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "下列套件將會被【移除】:"
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr "下列套件將會維持其原有版本:"
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr "下列套件將會被升級:"
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr "下列套件將會被【降級】:"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "下列被保留 (hold) 的套件將會被更改:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s(因為 %s)"
-
-#: apt-private/private-output.cc:696
-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"
-"除非您很清楚您在做什麼,否則請勿輕易嘗試!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "升級 %lu 個,新安裝 %lu 個,"
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "重新安裝 %lu 個,"
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "降級 %lu 個,"
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "移除 %lu 個,有 %lu 個未被升級。\n"
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu 個沒有完整得安裝或移除。\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "編譯正規表示式時發生錯誤 - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "update 指令不需任何參數"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1649,20 +1646,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "已有 "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "已有:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "下載:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "下載:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "略過 "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "略過:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "錯誤 "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "錯誤:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1688,17 +1689,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "無法讀取 %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1772,7 +1773,7 @@ msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]"
msgid "Merging available information"
msgstr "整合現有的資料"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1796,46 +1797,46 @@ msgstr ""
" -c=? 讀取指定的設定檔\n"
" -o=? 指定任意的設定選項,例如:-o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "無法取得 %s 的狀態"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "無法寫入 %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "無法取得 debconf 版本。是否有安裝 debconf?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "套件延伸列表過長"
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, c-format
msgid "Error processing directory %s"
msgstr "處理目錄 %s 時發生錯誤"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "原始碼的延伸列表太長"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "寫入標頭資訊到內容檔時發生錯誤"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, c-format
msgid "Error processing contents %s"
msgstr "處理內容 %s 時發生錯誤"
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1913,11 +1914,11 @@ msgstr ""
" -c=? 讀取指定的設定檔\n"
" -o=? 指定任意的設定選項"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "找不到符合的選項"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "套件檔案組 `%s' 少了部份檔案"
@@ -2029,22 +2030,22 @@ msgstr " 達到了 DeLink 的上限 %sB。\n"
msgid "Archive had no package field"
msgstr "套件檔裡沒有套件資訊"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 沒有重新定義項目\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的維護者是 %s,而非 %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 沒有原始碼重新定義項目\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 也沒有二元碼重新定義項目\n"
@@ -2130,7 +2131,7 @@ msgstr "在取消 %s 的連結時發生問題"
msgid "Failed to rename %s to %s"
msgstr "無法將 %s 更名為 %s"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2155,11 +2156,11 @@ msgstr ""
" -c=? 讀取指定的設定檔\n"
" -o=? 指定任意的設定選項,例如:-o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "未知的套件記錄!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
@@ -2230,6 +2231,26 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Hash Sum 不符"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "找不到安裝方式的驅動程式 %s。"
+
+#: apt-pkg/acquire-worker.cc:135
+#, fuzzy, c-format
+msgid "Is the package %s installed?"
+msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "安裝方式 %s 沒有正確啟動"
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中,然後按下 [Enter] 鍵。"
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "無法分析或開啟套件清單或狀況檔。"
@@ -2242,176 +2263,297 @@ msgstr "您也許得執行 apt-get update 以修正這些問題"
msgid "The list of sources could not be read."
msgstr "無法讀取來源列表。"
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "清空套件快取"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "套件快取檔損壞"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "套件快取檔版本不符"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "套件快取檔損壞"
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "本 APT 不支援 '%s' 版本系統"
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "這個套件快取是用於另一種平台的"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "相依關係"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "預先相依關係"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "建議"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "推薦"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "衝突"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "取代"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "廢棄"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr "毀損"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "重要"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "必要"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "標準"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "次要"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "額外"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
msgid "Calculating upgrade"
msgstr "籌備升級中"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "找不到安裝方式的驅動程式 %s。"
+msgid "Index file type '%s' is not supported"
+msgstr "不被支援的索引檔類型 '%s'"
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
#, fuzzy, c-format
-msgid "Is the package %s installed?"
-msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(URI 分析)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
+
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
+
+#: apt-pkg/sourcelist.cc:206
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "安裝方式 %s 沒有正確啟動"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:208
#, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中,然後按下 [Enter] 鍵。"
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(URI 分析)"
+
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(絕對發行版)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr "正在開啟 %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "來源列表 %2$s 中的第 %1$u 行太長。"
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤(類型)"
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "未知的類型 '%1$s',位於在來源列表 %3$s 中的第 %2$u 行"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "未知的類型 '%1$s',位於在來源列表 %3$s 中的第 %2$u 行"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "不被支援的索引檔類型 '%s'"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
-msgstr "正在重建相依關係"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "無法取得 %s 的狀態。"
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
-msgstr "候選版本"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "快取使用的是不相容的版本系統"
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
-msgstr "建立相依關係"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "在處理 %s 時發生錯誤 (FindPkg)"
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
-msgstr "正在讀取狀態資料"
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "哇呀,您已經超過這個 APT 所能處理的套件名稱數量了。"
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "哇呀,您已經超過這個 APT 所能處理的版本數量了。"
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "哇呀,您已經超過這個 APT 所能處理的說明數量了。"
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "哇呀,您已經超過這個 APT 所能處理的相依關係數量了。"
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "無法開啟 StateFile %s"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "在計算檔案相依性時找不到套件 %s %s"
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/pkgcachegen.cc:1196
#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "無法寫入暫存的 StateFile %s"
+msgid "Couldn't stat source package list %s"
+msgstr "無法取得來源套件列表 %s 的狀態"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "正在讀取套件清單"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "正在收集檔案提供者"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "在儲存來源快取時 IO 錯誤"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "無法重新命名,%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
msgid "Hash Sum mismatch"
msgstr "Hash Sum 不符"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "大小不符"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "無效的操作 %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "寫入錯誤"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2419,7 +2561,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
@@ -2435,49 +2577,49 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
"or malformed file)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "無法辨別 Release 檔 %s"
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr "無法取得以下的密鑰 ID 的公鑰:\n"
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr "發行版本衝突:%s(應當是 %s 但卻得到 %s)"
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
"contact the owner of the repository."
msgstr ""
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2486,122 +2628,53 @@ msgstr ""
"找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。(因為找不到平"
"台)"
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。"
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "快取使用的是不相容的版本系統"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "在處理 %s 時發生錯誤 (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "哇呀,您已經超過這個 APT 所能處理的套件名稱數量了。"
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "哇呀,您已經超過這個 APT 所能處理的版本數量了。"
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "哇呀,您已經超過這個 APT 所能處理的說明數量了。"
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "哇呀,您已經超過這個 APT 所能處理的相依關係數量了。"
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "在計算檔案相依性時找不到套件 %s %s"
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "無法取得來源套件列表 %s 的狀態"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr "正在讀取套件清單"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "正在收集檔案提供者"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "在儲存來源快取時 IO 錯誤"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "提供者區塊 %s 沒有包含指紋碼"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "找不到清單目錄 %spartial。"
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "找不到套件檔目錄 %spartial。"
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "不被支援的索引檔類型 '%s'"
+msgid "Unable to lock directory %s"
+msgstr "無法鎖定列表目錄"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr "正在取得檔案 %li/%li(還有 %s)"
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, c-format
msgid "Retrieving file %li of %li"
msgstr "正在取得檔案 %li/%li"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr "有一些索引檔不能下載,它們可能被略過了,或是替而使用原有的索引檔。"
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "在 sources.list 中必須包含一些 'source' URI"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "無法取得 %s 的狀態。"
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2623,19 +2696,19 @@ msgstr "無法分析鎖定類型 %s"
msgid "No priority (or zero) specified for pin"
msgstr "銷定並沒有優先順序之分(或零)"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "無法開啟檔案 %s"
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2645,10 +2718,12 @@ msgstr ""
"此安裝因衝突或預先相依關係,需暫時刪除 %s 這個基本套件。這通常不是好主意,但"
"若您執意進行,請設定 APT::Force-LoopBreak 選項。"
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "來源列表 %2$s 中的第 %1$u 行太長。"
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr "有一些索引檔不能下載,它們可能被略過了,或是替而使用原有的索引檔。"
#: apt-pkg/cdrom.cc:571
msgid "Unmounting CD-ROM...\n"
@@ -2715,11 +2790,11 @@ msgstr ""
msgid "Copying package lists..."
msgstr "正在複製套件清單..."
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
msgid "Writing new source list\n"
msgstr "正在寫入新的來源列表\n"
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr "該碟片的來源列表項目為:\n"
@@ -2729,7 +2804,7 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr "套件 %s 需要重新安裝,但找不到它的套件檔。"
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2737,139 +2812,40 @@ msgstr ""
"錯誤,pkgProblemResolver::Resolve 的建立中斷了,這可能肇因於保留 (hold) 套"
"件。"
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
msgid "Unable to correct problems, you have held broken packages."
msgstr "無法修正問題,您保留 (hold) 了損毀的套件。"
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "無法辨識套件檔 %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "無法辨識套件檔 %s (2)"
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "無法辨別 Release 檔 %s"
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有區段"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-
-#: apt-pkg/indexrecords.cc:152
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-
-#: apt-pkg/indexrecords.cc:171
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(URI 分析)"
-
-#: apt-pkg/sourcelist.cc:170
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
-
-#: apt-pkg/sourcelist.cc:173
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版)"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
-
-#: apt-pkg/sourcelist.cc:190
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
-
-#: apt-pkg/sourcelist.cc:193
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
+msgstr "正在重建相依關係"
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(URI 分析)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
+msgstr "候選版本"
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(絕對發行版)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
+msgstr "建立相依關係"
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤(發行版分析)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
+msgstr "正在讀取狀態資料"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/depcache.cc:252
#, c-format
-msgid "Opening %s"
-msgstr "正在開啟 %s"
+msgid "Failed to open StateFile %s"
+msgstr "無法開啟 StateFile %s"
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:258
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤(類型)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "無法寫入暫存的 StateFile %s"
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "未知的類型 '%1$s',位於在來源列表 %3$s 中的第 %2$u 行"
-
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "未知的類型 '%1$s',位於在來源列表 %3$s 中的第 %2$u 行"
+msgid "Unable to parse package file %s (%d)"
+msgstr "無法辨識套件檔 %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2881,208 +2857,101 @@ msgstr "找不到 '%2$s' 的 '%1$s' 發行版"
msgid "Version '%s' for '%s' was not found"
msgstr "找不到 '%s' 版的 '%s'"
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "無法找到主題 %s"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "無法找到套件 %s"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "無法找到套件 %s"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
+#: apt-pkg/indexrecords.cc:83
#, c-format
-msgid "Installing %s"
-msgstr "正在安裝 %s"
+msgid "Unable to parse Release file %s"
+msgstr "無法辨別 Release 檔 %s"
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
+#: apt-pkg/indexrecords.cc:91
#, c-format
-msgid "Configuring %s"
-msgstr "正在設定 %s"
+msgid "No sections in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有區段"
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Removing %s"
-msgstr "正在移除 %s"
+msgid "No Hash entry in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/indexrecords.cc:145
#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "已完整移除 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "正在執行安裝後套件後續處理程式 %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "找不到 '%s' 目錄"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/indexrecords.cc:164
#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "無法開啟檔案 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr "正在準備 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr "正在解開 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "正在準備設定 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1012
-#, c-format
-msgid "Installed %s"
-msgstr "已安裝 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1017
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr "正在準備移除 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, c-format
-msgid "Removed %s"
-msgstr "已移除 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "正在準備完整移除 %s"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Completely removed %s"
-msgstr "已完整移除 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "無法寫入 %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
+#, c-format
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "無法鎖定列表目錄"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "%lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
+msgstr "選項 %s 找不到"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3217,35 +3086,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... 完成"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "選項 %s 找不到"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "不能 mmap 空白檔案"
@@ -3309,107 +3149,263 @@ msgstr "無法取得掛載點 %s 的狀態"
msgid "Failed to stat the cdrom"
msgstr "無法取得 CD-ROM 的狀態"
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "無法辨識的縮寫類型:'%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "開啟設定檔 %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "語法錯誤 %s:%u:區塊開頭沒有名稱。"
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "語法錯誤 %s:%u:標籤格式錯誤"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "語法錯誤 %s:%u:數值後有多餘的垃圾"
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr "語法錯誤 %s:%u:指令只能於最高層級執行"
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "語法錯誤 %s:%u: 太多巢狀引入檔"
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "語法錯誤 %s:%u:從此引入"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "語法錯誤 %s:%u:不支援的指令 '%s'"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, fuzzy, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr "語法錯誤 %s:%u:指令只能於最高層級執行"
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "語法錯誤 %s:%u:在檔案結尾有多餘的垃圾"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "未知的命令列選項 '%c' [來自 %s]。"
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "無法理解的命令列選項 %s"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "命令列選項 %s 不是 boolean 值"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "需替選項 %s 指定參數。"
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "選項 %s:在指定設定項目時應該有 =<val>。"
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "選項 %s 的參數應該是數字,而不是 '%s'"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "選項 %s 太長"
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "偵測器 %s 無法理解,試試 true 或 false。"
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "無效的操作 %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr "正在安裝 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr "正在設定 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr "正在移除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "已完整移除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "正在執行安裝後套件後續處理程式 %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "找不到 '%s' 目錄"
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "無法開啟檔案 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr "正在準備 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr "正在解開 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "正在準備設定 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr "已安裝 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "正在準備移除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr "已移除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "正在準備完整移除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr "已完整移除 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "無法寫入 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "無法鎖定列表目錄"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "DropNode 在還有連結結點時被呼叫"
@@ -3514,7 +3510,7 @@ msgstr "這是個不正確的 DEB 套件檔,沒有 '%s' 成員"
msgid "Internal error, could not locate member %s"
msgstr "內部錯誤,找不找到成員 %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
msgid "Unparsable control file"
msgstr "無法分析的 control 檔"
@@ -3543,23 +3539,23 @@ msgstr "套件檔過短"
msgid "Failed to read the archive headers"
msgstr "讀取套件檔標頭失敗"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "無法建立管線"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "無法執行 gzip"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "損毀的套件檔"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar checksum 失敗,套件檔已損毀"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "未知的 TAR 標頭類型 %u,成員 %s"
diff --git a/prepare-release b/prepare-release
index e61266eef..8a3743ad7 100755
--- a/prepare-release
+++ b/prepare-release
@@ -52,14 +52,14 @@ if [ "$1" = 'pre-export' ]; then
VERSION="$VERSION~$(date +%Y%m%d)"
fi
+ sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.ac
+ sed -i -e "s/^<!ENTITY apt-product-version \".*\">$/<!ENTITY apt-product-version \"${VERSION}\">/" doc/apt-verbatim.ent
+
if [ "$(date +%Y-%m-%d)" != "$(grep --max-count=1 '^"POT-Creation-Date: .*\n"$' po/apt-all.pot | cut -d' ' -f 2)" -o \
"$(date +%Y-%m-%d)" != "$(grep --max-count=1 '^"POT-Creation-Date: .*\n"$' doc/po/apt-doc.pot | cut -d' ' -f 2)" ]; then
echo >&2 'POT files are not up-to-date. Execute »make update-po« for you…'
make update-po
fi
-
- sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.ac
- sed -i -e "s/^<!ENTITY apt-product-version \".*\">$/<!ENTITY apt-product-version \"${VERSION}\">/" doc/apt-verbatim.ent
elif [ "$1" = 'post-build' ]; then
if [ "$DISTRIBUTION" != "UNRELEASED" ]; then
echo >&2 "REMEMBER: Tag this release with »git tag ${VERSION}« if you are satisfied"
@@ -130,8 +130,8 @@ elif [ "$1" = 'coverage' ]; then
LCOVRC='--rc geninfo_checksum=1 --rc lcov_branch_coverage=1'
mkdir "$DIR"
lcov --no-external --directory . --capture --initial --output-file "${DIR}/apt.coverage.init" ${LCOVRC}
- make test
- ./test/integration/run-tests -q
+ make test || true
+ ./test/integration/run-tests -q || true
lcov --no-external --directory . --capture --output-file "${DIR}/apt.coverage.run" ${LCOVRC}
lcov -a "${DIR}/apt.coverage.init" -a "${DIR}/apt.coverage.run" -o "${DIR}/apt.coverage.total" ${LCOVRC}
cp "${DIR}/apt.coverage.total" "${DIR}/apt.coverage.fixed"
diff --git a/test/integration/framework b/test/integration/framework
index 153c5bb25..5d949009f 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -3,7 +3,7 @@
EXIT_CODE=0
# we all like colorful messages
-if [ "$MSGCOLOR" != 'NO' ]; then
+if [ "$MSGCOLOR" != 'NO' ] && [ "$MSGCOLOR" != 'ALWAYS' ]; then
if [ ! -t 1 ]; then # but check that we output to a terminal
export MSGCOLOR='NO'
fi
@@ -128,15 +128,23 @@ aptwebserver() { runapt "${APTWEBSERVERBINDIR}/aptwebserver" "$@"; }
aptitude() { runapt aptitude "$@"; }
aptextracttemplates() { runapt apt-extracttemplates "$@"; }
aptinternalsolver() { runapt "${APTINTERNALSOLVER}" "$@"; }
+aptdumpsolver() { runapt "${APTDUMPSOLVER}" "$@"; }
dpkg() {
- command dpkg --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log "$@"
+ "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" "$@"
}
dpkgcheckbuilddeps() {
command dpkg-checkbuilddeps --admindir=${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg "$@"
}
gdb() {
- local CMD="$1"
+ local CMD
+ case "$1" in
+ aptget) CMD="apt-get";;
+ aptcache) CMD="apt-cache";;
+ aptmark) CMD="apt-mark";;
+ apthelper) CMD="apt-helper";;
+ *) CMD="$1";;
+ esac
shift
runapt command gdb --quiet -ex run "${BUILDDIRECTORY}/$CMD" --args "${BUILDDIRECTORY}/$CMD" "$@"
}
@@ -188,12 +196,14 @@ setupenvironment() {
TESTDIRECTORY=$(readlink -f $(dirname $0))
# allow overriding the default BUILDDIR location
+ SOURCEDIRECTORY=${APT_INTEGRATION_TESTS_SOURCE_DIR:-"${TESTDIRECTORY}/../../"}
BUILDDIRECTORY=${APT_INTEGRATION_TESTS_BUILD_DIR:-"${TESTDIRECTORY}/../../build/bin"}
LIBRARYPATH=${APT_INTEGRATION_TESTS_LIBRARY_PATH:-"${BUILDDIRECTORY}"}
METHODSDIR=${APT_INTEGRATION_TESTS_METHODS_DIR:-"${BUILDDIRECTORY}/methods"}
APTHELPERBINDIR=${APT_INTEGRATION_TESTS_LIBEXEC_DIR:-"${BUILDDIRECTORY}"}
APTWEBSERVERBINDIR=${APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR:-"${BUILDDIRECTORY}"}
APTINTERNALSOLVER=${APT_INTEGRATION_TESTS_INTERNAL_SOLVER:-"${BUILDDIRECTORY}/apt-internal-solver"}
+ APTDUMPSOLVER=${APT_INTEGRATION_TESTS_DUMP_SOLVER:-"${BUILDDIRECTORY}/apt-dump-solver"}
test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first"
# -----
@@ -201,7 +211,7 @@ setupenvironment() {
mkdir rootdir aptarchive keys
cd rootdir
mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d
- mkdir -p usr/bin var/cache var/lib/apt var/log tmp
+ mkdir -p usr/bin var/cache var/lib var/log tmp
mkdir -p var/lib/dpkg/info var/lib/dpkg/updates var/lib/dpkg/triggers
touch var/lib/dpkg/available
mkdir -p usr/lib/apt
@@ -234,9 +244,8 @@ setupenvironment() {
echo "Dir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf
echo "Dir::state::status \"${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg/status\";" >> aptconfig.conf
- echo "Debug::NoLocking \"true\";" >> aptconfig.conf
echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf
- echo "Dir::Bin::Methods \"${METHODSDIR}\";" >> aptconfig.conf
+ echo "Dir::Bin::Methods \"${TMPWORKINGDIRECTORY}/rootdir/usr/lib/apt/methods\";" >> aptconfig.conf
# store apt-key were we can access it, even if we run it as a different user
# destroys coverage reporting though, so just do it for root for now
if [ "$(id -u)" = '0' ]; then
@@ -246,22 +255,37 @@ setupenvironment() {
else
echo "Dir::Bin::apt-key \"${BUILDDIRECTORY}/apt-key\";" >> aptconfig.conf
fi
- echo "Dir::Bin::dpkg \"fakeroot\";" >> aptconfig.conf
- echo "DPKG::options:: \"dpkg\";" >> aptconfig.conf
- echo "DPKG::options:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf
- echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf
- echo "DPKG::options:: \"--force-bad-path\";" >> aptconfig.conf
- if ! command dpkg --assert-multi-arch >/dev/null 2>&1; then
- echo "DPKG::options:: \"--force-architecture\";" >> aptconfig.conf # Added to test multiarch before dpkg is ready for it…
- fi
- echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf
- echo 'quiet::NoUpdate "true";' >> aptconfig.conf
- echo 'quiet::NoStatistic "true";' >> aptconfig.conf
- # too distracting for users, but helpful to detect changes
- echo 'Acquire::Progress::Ignore::ShowErrorText "true";' >> aptconfig.conf
- # in testcases, it can appear as if localhost has a rotation setup,
- # hide this as we can't really deal with it properly
- echo 'Acquire::Failure::ShowIP "false";' >> aptconfig.conf
+
+ cat << EOF > "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg"
+#!/bin/sh
+set -e
+if [ -r "${TMPWORKINGDIRECTORY}/noopchroot.so" ]; then
+ if [ -n "\$LD_PRELOAD" ]; then
+ export LD_PRELOAD="${TMPWORKINGDIRECTORY}/noopchroot.so \${LD_PRELOAD}"
+ else
+ export LD_PRELOAD="${TMPWORKINGDIRECTORY}/noopchroot.so"
+ fi
+fi
+exec fakeroot dpkg --root="${TMPWORKINGDIRECTORY}/rootdir" \\
+ --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log \\
+ --force-not-root --force-bad-path "\$@"
+EOF
+ chmod +x "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg"
+ echo "Dir::Bin::dpkg \"${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg\";" > rootdir/etc/apt/apt.conf.d/99dpkg
+
+ {
+ if ! command dpkg --assert-multi-arch >/dev/null 2>&1; then
+ echo "DPKG::options:: \"--force-architecture\";" # Added to test multiarch before dpkg is ready for it…
+ fi
+ echo 'quiet::NoUpdate "true";'
+ echo 'quiet::NoStatistic "true";'
+ # too distracting for users, but helpful to detect changes
+ echo 'Acquire::Progress::Ignore::ShowErrorText "true";'
+ echo 'Acquire::Progress::Diffpercent "true";'
+ # in testcases, it can appear as if localhost has a rotation setup,
+ # hide this as we can't really deal with it properly
+ echo 'Acquire::Failure::ShowIP "false";'
+ } >> aptconfig.conf
cp "${TESTDIRECTORY}/apt.pem" "${TMPWORKINGDIRECTORY}/rootdir/etc/webserver.pem"
if [ "$(id -u)" = '0' ]; then
@@ -271,6 +295,14 @@ setupenvironment() {
echo "Apt::Cmd::Disable-Script-Warning \"1\";" > rootdir/etc/apt/apt.conf.d/apt-binary
configcompression '.' 'gz' #'bz2' 'lzma' 'xz'
+ # create some files in /tmp and look at user/group to get what this means
+ TEST_DEFAULT_USER="$USER"
+ if [ "$(uname)" = 'GNU/kFreeBSD' ]; then
+ TEST_DEFAULT_GROUP='root'
+ else
+ TEST_DEFAULT_GROUP="$USER"
+ fi
+
# Acquire::AllowInsecureRepositories=false is not yet the default
# but we want it to be the default soon
configallowinsecurerepositories "false";
@@ -299,7 +331,7 @@ getarchitecture() {
}
getarchitectures() {
- echo "$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')"
+ aptconfig dump --no-empty --format '%v%n' APT::Architecture APT::Architectures | sort -u | tr '\n' ' '
}
getarchitecturesfromcommalist() {
@@ -349,6 +381,47 @@ configdpkg() {
fi
}
+configdpkgnoopchroot() {
+ # create a library to noop chroot() and rewrite maintainer script executions
+ # via execvp() as used by dpkg as we don't want our rootdir to be a fullblown
+ # chroot directory dpkg could chroot into to execute the maintainer scripts
+ msgtest 'Building library to preload to make maintainerscript work in' 'dpkg'
+ cat << EOF > noopchroot.c
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <dlfcn.h>
+
+static char * chrootdir = NULL;
+
+int chroot(const char *path) {
+ printf("WARNING: CHROOTing to %s was ignored!\n", path);
+ free(chrootdir);
+ chrootdir = strdup(path);
+ return 0;
+}
+int execvp(const char *file, char *const argv[]) {
+ static int (*func_execvp) (const char *, char * const []) = NULL;
+ if (func_execvp == NULL)
+ func_execvp = (int (*) (const char *, char * const [])) dlsym(RTLD_NEXT, "execvp");
+ if (chrootdir == NULL || strncmp(file, "/var/lib/dpkg/", strlen("/var/lib/dpkg/")) != 0)
+ return func_execvp(file, argv);
+ printf("REWRITE execvp call %s into %s\n", file, chrootdir);
+ char newfile[strlen(chrootdir) + strlen(file)];
+ strcpy(newfile, chrootdir);
+ strcat(newfile, file);
+ char const * const baseadmindir = "/var/lib/dpkg";
+ char admindir[strlen(chrootdir) + strlen(baseadmindir)];
+ strcpy(admindir, chrootdir);
+ strcat(admindir, baseadmindir);
+ setenv("DPKG_ADMINDIR", admindir, 1);
+ return func_execvp(newfile, argv);
+}
+EOF
+ testsuccess --nomsg gcc -fPIC -shared -o noopchroot.so noopchroot.c -ldl
+}
+
configallowinsecurerepositories() {
echo "Acquire::AllowInsecureRepositories \"$1\";" > rootdir/etc/apt/apt.conf.d/allow-insecure-repositories.conf
@@ -450,6 +523,12 @@ Package: $NAME" > debian/control
buildsimplenativepackage() {
local NAME="$1"
+ local NM
+ if [ "$(echo "$NAME" | cut -c 1-3)" = 'lib' ]; then
+ NM="$(echo "$NAME" | cut -c 1-4)"
+ else
+ NM="$(echo "$NAME" | cut -c 1)"
+ fi
local ARCH="$2"
local VERSION="$3"
local RELEASE="${4:-unstable}"
@@ -471,7 +550,7 @@ buildsimplenativepackage() {
fi
local BUILDDIR=${TMPWORKINGDIRECTORY}/incoming/${NAME}-${VERSION}
- msgninfo "Build package ${NAME} in ${VERSION} for ${RELEASE} in ${DISTSECTION}… "
+ msgtest "Build source package in version ${VERSION} for ${RELEASE} in ${DISTSECTION}" "$NAME"
mkdir -p $BUILDDIR/debian/source
echo "* most suckless software product ever" > ${BUILDDIR}/FEATURES
echo "#!/bin/sh
@@ -503,7 +582,10 @@ Package: $NAME" >> ${BUILDDIR}/debian/control
echo "Description: $DESCRIPTION" >> ${BUILDDIR}/debian/control
echo '3.0 (native)' > ${BUILDDIR}/debian/source/format
- (cd ${BUILDDIR}/..; dpkg-source -b ${NAME}-${VERSION} 2>&1) | sed -n 's#^dpkg-source: info: building [^ ]\+ in ##p' \
+ cd ${BUILDDIR}/..
+ testsuccess --nomsg dpkg-source -b ${NAME}-${VERSION}
+ cd - >/dev/null
+ sed -n 's#^dpkg-source: info: building [^ ]\+ in ##p' ${TMPWORKINGDIRECTORY}/rootdir/tmp/testsuccess.output \
| while read SRC; do
echo "pool/${SRC}" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.srclist
# if expr match "${SRC}" '.*\.dsc' >/dev/null 2>&1; then
@@ -515,6 +597,7 @@ Package: $NAME" >> ${BUILDDIR}/debian/control
done
for arch in $(getarchitecturesfromcommalist "$ARCH"); do
+ msgtest "Build binary package for ${RELEASE} in ${SECTION}" "$NAME"
rm -rf ${BUILDDIR}/debian/tmp
mkdir -p ${BUILDDIR}/debian/tmp/DEBIAN ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME} ${BUILDDIR}/debian/tmp/usr/bin
cp ${BUILDDIR}/debian/copyright ${BUILDDIR}/debian/changelog ${BUILDDIR}/FEATURES ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME}
@@ -526,19 +609,15 @@ Package: $NAME" >> ${BUILDDIR}/debian/control
(cd ${BUILDDIR}; dpkg-gencontrol -DArchitecture=$arch)
(cd ${BUILDDIR}/debian/tmp; md5sum $(find usr/ -type f) > DEBIAN/md5sums)
local LOG="${BUILDDIR}/../${NAME}_${VERSION}_${arch}.dpkg-deb.log"
- # ensure the right permissions as dpkg-deb ensists
+ # ensure the right permissions as dpkg-deb insists
chmod 755 ${BUILDDIR}/debian/tmp/DEBIAN
- if ! dpkg-deb -Z${COMPRESS_TYPE} --build ${BUILDDIR}/debian/tmp ${BUILDDIR}/.. >$LOG 2>&1; then
- cat $LOG
- false
- fi
- rm $LOG
+ testsuccess --nomsg dpkg-deb -Z${COMPRESS_TYPE} --build ${BUILDDIR}/debian/tmp ${BUILDDIR}/..
echo "pool/${NAME}_${VERSION}_${arch}.deb" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.pkglist
done
- mkdir -p ${BUILDDIR}/../${NAME}_${VERSION}
- cp ${BUILDDIR}/debian/changelog ${BUILDDIR}/../${NAME}_${VERSION}/
- cp ${BUILDDIR}/debian/changelog ${BUILDDIR}/../${NAME}_${VERSION}.changelog
+ local CHANGEPATH="${BUILDDIR}/../${DISTSECTION}/${NM}/${NAME}/${NAME}_${VERSION}"
+ mkdir -p $CHANGEPATH
+ cp ${BUILDDIR}/debian/changelog $CHANGEPATH
rm -rf "${BUILDDIR}"
msgdone "info"
}
@@ -550,15 +629,13 @@ buildpackage() {
local ARCH=$(getarchitecture $4)
local PKGNAME="$(echo "$BUILDDIR" | grep -o '[^/]*$')"
local BUILDLOG="$(readlink -f "${BUILDDIR}/../${PKGNAME}_${RELEASE}_${SECTION}.dpkg-bp.log")"
- msgninfo "Build package ${PKGNAME} for ${RELEASE} in ${SECTION}… "
+ msgtest "Build package for ${RELEASE} in ${SECTION}" "$PKGNAME"
cd $BUILDDIR
if [ "$ARCH" = "all" ]; then
ARCH="$(dpkg-architecture -qDEB_HOST_ARCH 2> /dev/null)"
fi
- if ! dpkg-buildpackage -uc -us -a$ARCH >$BUILDLOG 2>&1 ; then
- cat $BUILDLOG
- false
- fi
+ testsuccess --nomsg dpkg-buildpackage -uc -us -a$ARCH
+ cp ${TMPWORKINGDIRECTORY}/rootdir/tmp/testsuccess.output $BUILDLOG
local PKGS="$(grep '^dpkg-deb: building package' $BUILDLOG | cut -d'/' -f 2 | sed -e "s#'\.##")"
local SRCS="$(grep '^dpkg-source: info: building' $BUILDLOG | grep -o '[a-z0-9._+~-]*$')"
cd - > /dev/null
@@ -568,7 +645,6 @@ buildpackage() {
for SRC in $SRCS; do
echo "pool/${SRC}" >> ${TMPWORKINGDIRECTORY}/incoming/${RELEASE}.${SECTION}.srclist
done
- msgdone "info"
}
buildaptarchive() {
@@ -581,12 +657,8 @@ buildaptarchive() {
createaptftparchiveconfig() {
local COMPRESSORS="$(cut -d' ' -f 1 ${TMPWORKINGDIRECTORY}/rootdir/etc/testcase-compressor.conf | tr '\n' ' ')"
- COMPRESSORS="${COMPRESSORS%* }"
- local ARCHS="$(find pool/ -name '*.deb' | grep -oE '_[a-z0-9-]+\.deb$' | sort | uniq | sed -e '/^_all.deb$/ d' -e 's#^_\([a-z0-9-]*\)\.deb$#\1#' | tr '\n' ' ')"
- if [ -z "$ARCHS" ]; then
- # the pool is empty, so we will operate on faked packages - let us use the configured archs
- ARCHS="$(getarchitectures)"
- fi
+ local COMPRESSORS="${COMPRESSORS%* }"
+ local ARCHS="$(getarchitectures)"
echo -n 'Dir {
ArchiveDir "' >> ftparchive.conf
echo -n $(readlink -f .) >> ftparchive.conf
@@ -717,6 +789,8 @@ insertsource() {
local SPATH="aptarchive/dists/${RELEASE}/main/source"
mkdir -p $SPATH
local FILE="${SPATH}/Sources"
+ local DSCFILE="${NAME}_${VERSION}.dsc"
+ local TARFILE="${NAME}_${VERSION}.tar.gz"
echo "Package: $NAME
Binary: $NAME
Version: $VERSION
@@ -724,8 +798,8 @@ Maintainer: Joe Sixpack <joe@example.org>
Architecture: $ARCH" >> $FILE
test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
echo "Files:
- d41d8cd98f00b204e9800998ecf8427e 0 ${NAME}_${VERSION}.dsc
- d41d8cd98f00b204e9800998ecf8427e 0 ${NAME}_${VERSION}.tar.gz
+ $(echo -n "$DSCFILE" | md5sum | cut -d' ' -f 1) $(echo -n "$DSCFILE" | wc -c) $DSCFILE
+ $(echo -n "$TARFILE" | md5sum | cut -d' ' -f 1) $(echo -n "$TARFILE" | wc -c) $TARFILE
" >> $FILE
}
@@ -771,7 +845,7 @@ buildaptarchivefromincoming() {
[ -e ftparchive.conf ] || createaptftparchiveconfig
[ -e dists ] || buildaptftparchivedirectorystructure
msgninfo "\tGenerate Packages, Sources and Contents files… "
- aptftparchive -qq generate ftparchive.conf
+ testsuccess aptftparchive generate ftparchive.conf
cd - > /dev/null
msgdone "info"
generatereleasefiles "$@"
@@ -779,7 +853,9 @@ buildaptarchivefromincoming() {
buildaptarchivefromfiles() {
msginfo "Build APT archive for ${CCMD}$(basename $0)${CINFO} based on prebuild files…"
- find aptarchive -name 'Packages' -o -name 'Sources' -o -name 'Translation-*' | while read line; do
+ local DIR='aptarchive'
+ if [ -d "${DIR}/dists" ]; then DIR="${DIR}/dists"; fi
+ find "$DIR" -name 'Packages' -o -name 'Sources' -o -name 'Translation-*' | while read line; do
msgninfo "\t${line} file… "
compressfile "$line" "$1"
msgdone "info"
@@ -811,6 +887,7 @@ getcodenamefromsuite() {
}
getreleaseversionfromsuite() { true; }
getlabelfromsuite() { true; }
+getoriginfromsuite() { true; }
generatereleasefiles() {
# $1 is the Date header and $2 is the ValidUntil header to be set
@@ -822,16 +899,21 @@ generatereleasefiles() {
local CODENAME="$(getcodenamefromsuite $SUITE)"
local VERSION="$(getreleaseversionfromsuite $SUITE)"
local LABEL="$(getlabelfromsuite $SUITE)"
+ local ORIGIN="$(getoriginfromsuite $SUITE)"
if [ -n "$VERSION" ]; then
VERSION="-o APT::FTPArchive::Release::Version=${VERSION}"
fi
if [ -n "$LABEL" ]; then
LABEL="-o APT::FTPArchive::Release::Label=${LABEL}"
fi
+ if [ -n "$ORIGIN" ]; then
+ ORIGIN="-o APT::FTPArchive::Release::Origin=${ORIGIN}"
+ fi
aptftparchive -qq release $dir \
-o APT::FTPArchive::Release::Suite="${SUITE}" \
-o APT::FTPArchive::Release::Codename="${CODENAME}" \
${LABEL} \
+ ${ORIGIN} \
${VERSION} \
| sed -e '/0 Release$/ d' > $dir/Release # remove the self reference
if [ "$SUITE" = "experimental" -o "$SUITE" = "experimental2" ]; then
@@ -949,7 +1031,17 @@ signreleasefiles() {
msgdone "info"
}
+redatereleasefiles() {
+ local DATE="$(date -d "$1" '+%a, %d %b %Y %H:%M:%S %Z')"
+ for release in $(find aptarchive/ -name 'Release'); do
+ sed -i "s/^Date: .*$/Date: ${DATE}/" $release
+ touch -d "$DATE" $release
+ done
+ signreleasefiles "${2:-Joe Sixpack}"
+}
+
webserverconfig() {
+ local WEBSERVER="${3:-http://localhost:8080}"
local NOCHECK=false
if [ "$1" = '--no-check' ]; then
NOCHECK=true
@@ -961,10 +1053,10 @@ webserverconfig() {
local URI
if [ -n "$2" ]; then
msgtest "Set webserver config option '${1}' to" "$2"
- URI="http://localhost:8080/_config/set/${1}/${2}"
+ URI="${WEBSERVER}/_config/set/${1}/${2}"
else
msgtest 'Clear webserver config option' "${1}"
- URI="http://localhost:8080/_config/clear/${1}"
+ URI="${WEBSERVER}/_config/clear/${1}"
fi
if downloadfile "$URI" "$STATUS" > "$DOWNLOG"; then
msgpass
@@ -1069,9 +1161,11 @@ acquire::cdrom::autodetect 0;" > rootdir/etc/apt/apt.conf.d/00cdrom
}
downloadfile() {
- local PROTO="$(echo "$1" | cut -d':' -f 1 )"
- apthelper -o Debug::Acquire::${PROTO}=1 \
- download-file "$1" "$2" 2>&1 || true
+ local PROTO="${1%%:*}"
+ if ! apthelper -o Debug::Acquire::${PROTO}=1 -o Debug::pkgAcquire::Worker=1 \
+ download-file "$1" "$2" "$3" 2>&1 ; then
+ return 1
+ fi
# only if the file exists the download was successful
if [ -r "$2" ]; then
return 0
@@ -1096,9 +1190,9 @@ testfileequal() {
shift
msgtest "Test for correctness of file" "$FILE"
if [ -z "$*" ]; then
- echo -n "" | checkdiff $FILE - && msgpass || msgfail
+ echo -n "" | checkdiff - $FILE && msgpass || msgfail
else
- echo "$*" | checkdiff $FILE - && msgpass || msgfail
+ echo "$*" | checkdiff - $FILE && msgpass || msgfail
fi
}
@@ -1108,6 +1202,7 @@ testempty() {
if "$@" >$COMPAREFILE 2>&1 && test ! -s $COMPAREFILE; then
msgpass
else
+ echo
cat $COMPAREFILE
msgfail
fi
@@ -1186,10 +1281,13 @@ testnopackage() {
fi
}
-testdpkginstalled() {
- msgtest "Test for correctly installed package(s) with" "dpkg -l $*"
- local PKGS="$(dpkg -l "$@" 2>/dev/null | grep '^i' | wc -l)"
- if [ "$PKGS" != $# ]; then
+testdpkgstatus() {
+ local STATE="$1"
+ local NR="$2"
+ shift 2
+ msgtest "Test that $NR package(s) are in state $STATE with" "dpkg -l $*"
+ local PKGS="$(dpkg -l "$@" 2>/dev/null | grep "^${STATE}" | wc -l)"
+ if [ "$PKGS" != $NR ]; then
echo >&2 $PKGS
dpkg -l "$@" | grep '^[a-z]' >&2
msgfail
@@ -1198,16 +1296,12 @@ testdpkginstalled() {
fi
}
+testdpkginstalled() {
+ testdpkgstatus 'ii' "$#" "$@"
+}
+
testdpkgnotinstalled() {
- msgtest "Test for correctly not-installed package(s) with" "dpkg -l $*"
- local PKGS="$(dpkg -l "$@" 2> /dev/null | grep '^i' | wc -l)"
- if [ "$PKGS" != 0 ]; then
- echo
- dpkg -l "$@" | grep '^[a-z]' >&2
- msgfail
- else
- msgpass
- fi
+ testdpkgstatus 'ii' '0' "$@"
}
testmarkedauto() {
@@ -1283,7 +1377,7 @@ testwarning() {
else
msgtest 'Test for successful execution with warnings of' "$*"
fi
- local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testsuccess.output"
+ local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testwarning.output"
if "$@" >${OUTPUT} 2>&1; then
if expr match "$1" '^apt.*' >/dev/null; then
if grep -q -E ' runtime error: ' "$OUTPUT"; then
@@ -1333,15 +1427,49 @@ testfailure() {
aptautotest 'testfailure' "$@"
}
+testsuccessequal() {
+ local CMP="$1"
+ shift
+ testsuccess "$@"
+ testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/testsuccess.output" "$CMP"
+}
+testwarningequal() {
+ local CMP="$1"
+ shift
+ testwarning "$@"
+ testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/testwarning.output" "$CMP"
+}
+testfailureequal() {
+ local CMP="$1"
+ shift
+ testfailure "$@"
+ testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output" "$CMP"
+}
+
+testfailuremsg() {
+ local CMP="$1"
+ shift
+ testfailure "$@"
+ msgtest 'Check that the output of the previous failed command has expected' 'failures and warnings'
+ grep '^\(W\|E\):' "${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output" > "${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailureequal.output" 2>&1 || true
+ if echo "$CMP" | checkdiff - "${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailureequal.output"; then
+ msgpass
+ else
+ echo '### Complete output ###'
+ cat "${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output"
+ msgfail
+ fi
+}
+
testfilestats() {
msgtest "Test that file $1 has $2 $3" "$4"
if [ "$4" "$3" "$(stat --format "$2" "$1")" ]; then
msgpass
else
echo >&2
- ls -l >&2 "$1"
+ ls -ld >&2 "$1" || true
echo -n >&2 "stat(1) reports for $2: "
- stat --format "$2" "$1"
+ stat --format "$2" "$1" || true
msgfail
fi
}
@@ -1376,12 +1504,32 @@ pause() {
}
listcurrentlistsdirectory() {
- find rootdir/var/lib/apt/lists -maxdepth 1 -type d | while read line; do
- stat --format '%U:%G:%a:%n' "$line"
- done
- find rootdir/var/lib/apt/lists -maxdepth 1 \! -type d | while read line; do
- stat --format '%U:%G:%a:%s:%y:%n' "$line"
- done
+ {
+ find rootdir/var/lib/apt/lists -maxdepth 1 -type d | while read line; do
+ stat --format '%U:%G:%a:%n' "$line"
+ done
+ find rootdir/var/lib/apt/lists -maxdepth 1 \! -type d | while read line; do
+ stat --format '%U:%G:%a:%s:%y:%n' "$line"
+ done
+ } | sort
+}
+
+### convinience hacks ###
+mkdir() {
+ # creating some directories by hand is a tedious task, so make it look simple
+ if [ "$*" = '-p rootdir/var/lib/apt/lists' ] || [ "$*" = "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" ] ||
+ [ "$*" = '-p rootdir/var/lib/apt/lists/partial' ] || [ "$*" = "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/partial" ]; then
+ # only the last directory created by mkdir is effected by the -m !
+ command mkdir -m 755 -p "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt"
+ command mkdir -m 755 -p "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists"
+ command mkdir -m 700 -p "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/partial"
+ touch "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/lock"
+ if [ "$(id -u)" = '0' ]; then
+ chown _apt:root "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/partial"
+ fi
+ else
+ command mkdir "$@"
+ fi
}
### The following tests are run by most test methods automatically to check
@@ -1407,10 +1555,39 @@ aptautotest() {
}
aptautotest_aptget_update() {
+ local TESTCALL="$1"
+ while [ -n "$2" ]; do
+ if [ "$2" = '--print-uris' ]; then return; fi # simulation mode
+ shift
+ done
if ! test -d "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists"; then return; fi
+ testfilestats "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt" '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:755"
+ testfilestats "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:755"
# all copied files are properly chmodded
- for file in $(find "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" -maxdepth 1 -type f); do
- testfilestats "$file" '%U:%G:%a' '=' "${USER}:${USER}:644"
+ for file in $(find "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" -type f ! -name 'lock'); do
+ testfilestats "$file" '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:644"
done
+ if [ "$TESTCALL" = 'testsuccess' ]; then
+ # failure cases can retain partial files and such
+ testempty find "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/partial" -mindepth 1 ! \( -name 'lock' -o -name '*.FAILED' \)
+ fi
}
aptautotest_apt_update() { aptautotest_aptget_update "$@"; }
+aptautotest_aptcdrom_add() { aptautotest_aptget_update "$@"; }
+
+testaptautotestnodpkgwarning() {
+ local TESTCALL="$1"
+ while [ -n "$2" ]; do
+ if expr match "$2" '^-[a-z]*s' >/dev/null 2>&1; then return; fi # simulation mode
+ if expr match "$2" '^-dy\?' >/dev/null 2>&1; then return; fi # download-only mode
+ shift
+ done
+ testfailure grep '^dpkg: warning:.*ignor.*' "${TMPWORKINGDIRECTORY}/rootdir/tmp-before/${TESTCALL}.output"
+}
+
+aptautotest_aptget_install() { testaptautotestnodpkgwarning "$@"; }
+aptautotest_aptget_remove() { testaptautotestnodpkgwarning "$@"; }
+aptautotest_aptget_purge() { testaptautotestnodpkgwarning "$@"; }
+aptautotest_apt_install() { testaptautotestnodpkgwarning "$@"; }
+aptautotest_apt_remove() { testaptautotestnodpkgwarning "$@"; }
+aptautotest_apt_purge() { testaptautotestnodpkgwarning "$@"; }
diff --git a/test/integration/skip-aptwebserver b/test/integration/skip-aptwebserver
deleted file mode 100755
index 0622941ce..000000000
--- a/test/integration/skip-aptwebserver
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-set -e
-
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
-
-setupenvironment
-configarchitecture 'amd64'
-
-buildsimplenativepackage 'apt' 'all' '1.0' 'stable'
-
-setupaptarchive
-changetowebserver
-
-rm -rf rootdir/var/lib/apt/lists
-aptget update -qq
-testequal 'Hit http://localhost stable InRelease
-Hit http://localhost stable/main Sources
-Hit http://localhost stable/main amd64 Packages
-Hit http://localhost stable/main Translation-en
-Reading package lists...' aptget update
-
-mv rootdir/var/lib/apt/lists/localhost* rootdir/var/lib/apt/lists/partial
-aptget update
-
diff --git a/test/integration/test-00-commands-have-help b/test/integration/test-00-commands-have-help
new file mode 100755
index 000000000..f2317dbdf
--- /dev/null
+++ b/test/integration/test-00-commands-have-help
@@ -0,0 +1,63 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'amd64'
+
+# this test does double duty: The obvious is checking for --help and co,
+# but it also checks if the binary can find all methods in the library.
+# The later is quite handy for manual testing of non-abibreaking changes
+export LD_BIND_NOW=1
+
+checkversionmessage() {
+ testsuccess grep '^apt .* (' ${1}-help.output
+}
+
+checkhelpmessage() {
+ checkversionmessage "$1"
+ testsuccess grep '^Usage:' ${1}-help.output
+}
+
+checkoptions() {
+ testsuccess $1 --help
+ cp -f rootdir/tmp/testsuccess.output ${1}-help.output
+ checkhelpmessage "$1"
+
+ testsuccess $1 --version
+ cp -f rootdir/tmp/testsuccess.output ${1}-help.output
+ checkversionmessage "$1"
+}
+
+for CMD in 'apt-cache' 'apt-cdrom' 'apt-config' \
+ 'apt-extracttemplates' 'apt-get' 'apt-helper' \
+ 'apt-mark' 'apt-sortpkgs' 'apt' 'apt-ftparchive'; do
+ cmd="$(echo "$CMD" | tr -d '-')"
+ msgtest 'Test for failure with no parameters calling' "$CMD"
+ if $cmd > ${cmd}-help.output 2>&1; then
+ echo
+ cat ${cmd}-help.output
+ msgfail 'zero exit'
+ else
+ msgpass
+ fi
+ checkhelpmessage "$cmd"
+ checkoptions "$cmd"
+done
+
+for CMD in 'apt-dump-solver' 'apt-internal-solver'; do
+ checkoptions "$(echo "$CMD" | tr -d '-')"
+done
+
+# in times of need, we all look for super cow to save the day
+testsuccess aptget moo
+testsuccess aptget moo -q=2
+testsuccess aptget moo moo
+testsuccess aptget moo moo -q=2
+testsuccess aptget moo moo --color
+testsuccess aptget moo moo moo
+testsuccess aptget moo moo moo -q=2
+testsuccess aptget moo moo moo moo
+testsuccess aptget moo moo moo moo -q=2
diff --git a/test/integration/test-acquire-same-file-multiple-times b/test/integration/test-acquire-same-file-multiple-times
new file mode 100755
index 000000000..526765521
--- /dev/null
+++ b/test/integration/test-acquire-same-file-multiple-times
@@ -0,0 +1,80 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64'
+
+TESTFILE="$TESTDIR/framework"
+cp $TESTFILE aptarchive/foo
+APTARCHIVE="$(readlink -f ./aptarchive)"
+
+filedown() {
+ msgtest 'Downloading the same URI twice over file' "$1"
+ testsuccess --nomsg apthelper download-file file:///$APTARCHIVE/foo ./downloaded/foo1 '' file:///$APTARCHIVE/foo ./downloaded/foo2 '' -o Debug::pkgAcquire::Worker=1
+ cp rootdir/tmp/testsuccess.output download.log
+ #cat download.log
+ testsuccess cmp $TESTFILE ./downloaded/foo1
+ testsuccess cmp ./downloaded/foo1 ./downloaded/foo2
+ #testequal '1' grep -c '200%20URI%20Start' ./download.log
+ testequal '1' grep -c '201%20URI%20Done' ./download.log
+ rm -f ./downloaded/foo1 ./downloaded/foo2
+}
+
+testrun() {
+ $1 'no partial'
+ cp $TESTFILE ./downloaded/foo1
+ $1 'complete partial 1'
+ cp $TESTFILE ./downloaded/foo2
+ $1 'complete partial 2'
+ cp $TESTFILE ./downloaded/foo1
+ cp $TESTFILE ./downloaded/foo2
+ $1 'complete partial 1+2'
+ dd if=$TESTFILE of=./downloaded/foo1 bs=500 count=1 2>/dev/null
+ $1 'partial partial 1'
+ dd if=$TESTFILE of=./downloaded/foo2 bs=500 count=1 2>/dev/null
+ $1 'partial partial 2'
+ dd if=$TESTFILE of=./downloaded/foo1 bs=500 count=1 2>/dev/null
+ dd if=$TESTFILE of=./downloaded/foo2 bs=500 count=1 2>/dev/null
+ $1 'partial partial 1+2'
+}
+testrun 'filedown'
+
+changetowebserver -o aptwebserver::redirect::replace::/foo2=/foo
+
+httpdown() {
+ msgtest 'Downloading the same URI to different files' 'twice over http'
+ testsuccess --nomsg apthelper download-file http://localhost:8080/foo ./downloaded/foo1 '' http://localhost:8080/foo ./downloaded/foo2 '' -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::http=1
+ cp rootdir/tmp/testsuccess.output download.log
+ testsuccess cmp $TESTDIR/framework ./downloaded/foo1
+ testsuccess cmp ./downloaded/foo1 ./downloaded/foo2
+ testequal '1' grep -c '200%20URI%20Start' ./download.log
+ testequal '1' grep -c '201%20URI%20Done' ./download.log
+ rm -f ./downloaded/foo1 ./downloaded/foo2
+}
+testrun 'httpdown'
+
+httpredirectdown() {
+ msgtest 'Redirect leads' 'first URI to the second URI'
+ testsuccess --nomsg apthelper download-file http://localhost:8080/foo2 ./downloaded/foo1 '' http://localhost:8080/foo ./downloaded/foo2 '' -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::http=1
+ cp rootdir/tmp/testsuccess.output download.log
+ testsuccess cmp $TESTDIR/framework ./downloaded/foo1
+ testsuccess cmp ./downloaded/foo1 ./downloaded/foo2
+ testequal '1' grep -c '200%20URI%20Start' ./download.log
+ testequal '1' grep -c '103%20Redirect' ./download.log
+ testequal '1' grep -c '201%20URI%20Done' ./download.log
+ rm -f ./downloaded/foo1 ./downloaded/foo2
+}
+testrun 'httpredirectdown'
+
+httpsamedown() {
+ msgtest 'Downloading two files via the same URI to' 'the same file'
+ testsuccess --nomsg apthelper download-file http://localhost:8080/foo ./downloaded/foo1 '' http://localhost:8080/foo ./downloaded/foo1 '' -o Debug::pkgAcquire::Worker=1
+ cp rootdir/tmp/testsuccess.output download.log
+ testsuccess cmp $TESTDIR/framework ./downloaded/foo1
+ testequal '1' grep -c '200%20URI%20Start' ./download.log
+ testequal '1' grep -c '201%20URI%20Done' ./download.log
+ rm -f ./downloaded/foo1
+}
+testrun 'httpsamedown'
diff --git a/test/integration/test-acquire-same-repository-multiple-times b/test/integration/test-acquire-same-repository-multiple-times
new file mode 100755
index 000000000..a46e0d73c
--- /dev/null
+++ b/test/integration/test-acquire-same-repository-multiple-times
@@ -0,0 +1,81 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64'
+
+TESTFILE="$TESTDIR/framework"
+cp $TESTFILE aptarchive/foo
+APTARCHIVE="$(readlink -f ./aptarchive)"
+
+getcodenamefromsuite() { echo "jessie"; }
+buildsimplenativepackage 'foo' 'all' '1.0' 'stable'
+setupaptarchive --no-update
+ln -s "${APTARCHIVE}/dists/stable" "${APTARCHIVE}/dists/jessie"
+for FILE in rootdir/etc/apt/sources.list.d/*-stable-* ; do
+ sed 's#stable#jessie#g' $FILE > $(echo "$FILE" | sed 's#stable#jessie#g')
+done
+
+# install a slowed down file: otherwise its to fast to reproduce combining
+NEWMETHODS="$(readlink -f rootdir)/usr/lib/apt/methods"
+OLDMETHODS="$(readlink -f rootdir/usr/lib/apt/methods)"
+rm $NEWMETHODS
+mkdir $NEWMETHODS
+for METH in $(find $OLDMETHODS ! -type d); do
+ ln -s $OLDMETHODS/$(basename $METH) $NEWMETHODS
+done
+rm $NEWMETHODS/file
+cat >$NEWMETHODS/file <<EOF
+#!/bin/sh
+while read line; do
+ echo "\$line"
+ if [ -z "\$line" ]; then
+ sleep 0.5
+ fi
+done | $OLDMETHODS/file
+EOF
+chmod +x $NEWMETHODS/file
+
+tworepos() {
+ msgtest "Downloading the same repository twice over $1" "$3"
+ testsuccess --nomsg aptget update -o Debug::pkgAcquire::Worker=1
+ cp rootdir/tmp/testsuccess.output download.log
+ #cat download.log
+ aptget files --format '$(FILENAME)' --no-release-info | sort > file.lst
+ testequal "$(find $(readlink -f ./rootdir/var/lib/apt/lists) -name '*_dists_*' \( ! -name '*InRelease' \) -type f | sort)" cat file.lst
+ testsuccess aptcache policy
+ testequal "foo:
+ Installed: (none)
+ Candidate: 1.0
+ Version table:
+ 1.0 0
+ 500 $1:$2 jessie/main amd64 Packages
+ 500 $1:$2 stable/main amd64 Packages" aptcache policy foo
+ testfailure aptcache show foo/unstable
+ testsuccess aptcache show foo/stable
+ testsuccess aptcache show foo/jessie
+}
+
+tworepos 'file' "$APTARCHIVE" 'no partial'
+testequal '12' grep -c '200%20URI%20Start' ./download.log
+testequal '12' grep -c '201%20URI%20Done' ./download.log
+testequal '6' grep -c '^ @ Queue: Action combined' ./download.log
+tworepos 'file' "$APTARCHIVE" 'hit'
+testequal '6' grep -c '200%20URI%20Start' ./download.log
+testequal '6' grep -c '201%20URI%20Done' ./download.log
+testequal '0' grep -c '^ @ Queue: Action combined' ./download.log
+rm -rf rootdir/var/lib/apt/lists
+
+changetowebserver
+
+tworepos 'http' '//localhost:8080' 'no partial'
+testequal '10' grep -c '200%20URI%20Start' ./download.log
+testequal '10' grep -c '201%20URI%20Done' ./download.log
+testequal '6' grep -c '^ @ Queue: Action combined' ./download.log
+tworepos 'http' '//localhost:8080' 'hit'
+testequal '2' grep -c '200%20URI%20Start' ./download.log
+testequal '4' grep -c '201%20URI%20Done' ./download.log
+testequal '0' grep -c '^ @ Queue: Action combined' ./download.log
+rm -rf rootdir/var/lib/apt/lists
diff --git a/test/integration/test-allow-scores-for-all-dependency-types b/test/integration/test-allow-scores-for-all-dependency-types
index d1bcf1130..56cfc9a69 100755
--- a/test/integration/test-allow-scores-for-all-dependency-types
+++ b/test/integration/test-allow-scores-for-all-dependency-types
@@ -32,12 +32,17 @@ insertpackage 'multipleyes' 'foo' 'amd64' '2.2' 'Conflicts: bar (<= 3)'
# having foo multiple times as conflict is a non-advisable hack in general
insertpackage 'multipleyes' 'bar' 'amd64' '2.2' 'Conflicts: foo (<= 3), foo (<= 3)'
+#774924 - slightly simplified
+insertpackage 'jessie' 'login' 'amd64' '2' 'Pre-Depends: libaudit1 (>= 0)'
+insertpackage 'jessie' 'libaudit1' 'amd64' '2' 'Depends: libaudit-common (>= 0)'
+insertpackage 'jessie' 'libaudit-common' 'amd64' '2' 'Breaks: libaudit0, libaudit1 (<< 2)'
+
cp rootdir/var/lib/dpkg/status rootdir/var/lib/dpkg/status-backup
setupaptarchive
insertinstalledpackage 'libdb-dev' 'amd64' '5.1.7' 'Depends: libdb5.1-dev'
insertinstalledpackage 'libdb5.1-dev' 'amd64' '5.1.29-7'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
@@ -52,7 +57,7 @@ Inst libdb-dev [5.1.7] (5.3.0 unversioned [amd64]) []
Inst libdb5.3-dev (5.3.28-3 unversioned [amd64])
Conf libdb5.3-dev (5.3.28-3 unversioned [amd64])
Conf libdb-dev (5.3.0 unversioned [amd64])' aptget dist-upgrade -st unversioned
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
@@ -71,25 +76,25 @@ Conf libdb-dev (5.3.0 versioned [amd64])' aptget dist-upgrade -st versioned
cp -f rootdir/var/lib/dpkg/status-backup rootdir/var/lib/dpkg/status
insertinstalledpackage 'foo' 'amd64' '1'
insertinstalledpackage 'bar' 'amd64' '1'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages have been kept back:
bar foo
0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.' aptget dist-upgrade -st unversioned
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages have been kept back:
bar foo
0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.' aptget dist-upgrade -st versioned
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages have been kept back:
bar foo
0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.' aptget dist-upgrade -st multipleno
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
@@ -101,14 +106,14 @@ Remv foo [1]
Inst bar [1] (2.2 multipleyes [amd64])
Conf bar (2.2 multipleyes [amd64])' aptget dist-upgrade -st multipleyes
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
baz
0 upgraded, 1 newly installed, 0 to remove and 2 not upgraded.
Inst baz (2 unversioned [amd64])
Conf baz (2 unversioned [amd64])' aptget install baz -st unversioned
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
foo
@@ -125,14 +130,14 @@ Inst baz (2 versioned [amd64])
Conf foo (2 versioned [amd64])
Conf baz (2 versioned [amd64])' aptget install baz -st versioned
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
baz
0 upgraded, 1 newly installed, 0 to remove and 2 not upgraded.
Inst baz (2 unversioned [amd64])
Conf baz (2 unversioned [amd64])' aptget install baz -st unversioned
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
foo
@@ -148,3 +153,27 @@ Inst foo [1] (2 versioned [amd64])
Inst baz (2 versioned [amd64])
Conf foo (2 versioned [amd64])
Conf baz (2 versioned [amd64])' aptget install baz -st versioned
+
+# recreating the exact situation is hard, so we pull tricks to get the score
+cp -f rootdir/var/lib/dpkg/status-backup rootdir/var/lib/dpkg/status
+insertinstalledpackage 'gdm3' 'amd64' '1' 'Depends: libaudit0, libaudit0'
+insertinstalledpackage 'login' 'amd64' '1' 'Essential: yes'
+insertinstalledpackage 'libaudit0' 'amd64' '1'
+testsuccessequal 'Reading package lists...
+Building dependency tree...
+Calculating upgrade...
+The following packages will be REMOVED:
+ gdm3 libaudit0
+The following NEW packages will be installed:
+ libaudit-common libaudit1
+The following packages will be upgraded:
+ login
+1 upgraded, 2 newly installed, 2 to remove and 0 not upgraded.
+Remv gdm3 [1]
+Remv libaudit0 [1]
+Inst libaudit-common (2 jessie [amd64])
+Conf libaudit-common (2 jessie [amd64])
+Inst libaudit1 (2 jessie [amd64])
+Conf libaudit1 (2 jessie [amd64])
+Inst login [1] (2 jessie [amd64])
+Conf login (2 jessie [amd64])' aptget dist-upgrade -st jessie
diff --git a/test/integration/test-apt-acquire-additional-files b/test/integration/test-apt-acquire-additional-files
new file mode 100755
index 000000000..3465c0a16
--- /dev/null
+++ b/test/integration/test-apt-acquire-additional-files
@@ -0,0 +1,95 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'amd64'
+
+# note that in --print-uri we talk about .bz2 because that is the default.
+# This doesn't mean it is actually attempt to download it.
+configcompression '.' 'gz'
+
+buildsimplenativepackage 'foo' 'amd64' '1' 'unstable'
+
+setupaptarchive --no-update
+changetowebserver
+
+testequal "'http://localhost:8080/dists/unstable/InRelease' localhost:8080_dists_unstable_InRelease 0
+'http://localhost:8080/dists/unstable/main/source/Sources.bz2' localhost:8080_dists_unstable_main_source_Sources 0
+'http://localhost:8080/dists/unstable/main/binary-amd64/Packages.bz2' localhost:8080_dists_unstable_main_binary-amd64_Packages 0
+'http://localhost:8080/dists/unstable/main/i18n/Translation-en.bz2' localhost:8080_dists_unstable_main_i18n_Translation-en 0 " aptget update --print-uris
+
+testsuccessequal "Get:1 http://localhost:8080 unstable InRelease [$(stat -c%s aptarchive/dists/unstable/InRelease) B]
+Get:2 http://localhost:8080 unstable/main Sources [$(stat -c%s aptarchive/dists/unstable/main/source/Sources.gz) B]
+Get:3 http://localhost:8080 unstable/main amd64 Packages [$(stat -c%s aptarchive/dists/unstable/main/binary-amd64/Packages.gz) B]
+Get:4 http://localhost:8080 unstable/main Translation-en [$(stat -c%s aptarchive/dists/unstable/main/i18n/Translation-en.gz) B]
+Reading package lists..." aptget update
+
+testempty find rootdir/var/lib/apt/lists -name '*Contents*'
+
+cat > rootdir/etc/apt/apt.conf.d/content-target.conf <<EOF
+APT::Acquire::Targets::deb::Contents {
+ MetaKey "\$(COMPONENT)/Contents-\$(ARCHITECTURE)";
+ ShortDescription "Contents";
+ Description "\$(SITE) \$(RELEASE)/\$(COMPONENT) \$(ARCHITECTURE) Contents";
+};
+EOF
+
+testequal "$(readlink -f ./rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_Contents-amd64)" aptget files --no-release-info --format '$(FILENAME)' 'Created-By: Contents'
+testempty aptget files --format '$(FILENAME)' 'Created-By: Contents'
+# lets fake the existence of a compressed Contents file
+touch ./rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_Contents-amd64.gz
+testequal "$(readlink -f ./rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_Contents-amd64.gz)" aptget files --format '$(FILENAME)' 'Created-By: Contents'
+
+testequal "'http://localhost:8080/dists/unstable/InRelease' localhost:8080_dists_unstable_InRelease 0
+'http://localhost:8080/dists/unstable/main/source/Sources.bz2' localhost:8080_dists_unstable_main_source_Sources 0
+'http://localhost:8080/dists/unstable/main/binary-amd64/Packages.bz2' localhost:8080_dists_unstable_main_binary-amd64_Packages 0
+'http://localhost:8080/dists/unstable/main/i18n/Translation-en.bz2' localhost:8080_dists_unstable_main_i18n_Translation-en 0
+'http://localhost:8080/dists/unstable/main/Contents-amd64.bz2' localhost:8080_dists_unstable_main_Contents-amd64 0 " aptget update --print-uris
+
+testsuccessequal "Hit:1 http://localhost:8080 unstable InRelease
+Get:2 http://localhost:8080 unstable/main amd64 Contents [$(stat -c%s aptarchive/dists/unstable/main/Contents-amd64.gz) B]
+Reading package lists..." aptget update
+
+testequal 'rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_Contents-amd64' find rootdir/var/lib/apt/lists -name '*Contents*'
+testequal "$(readlink -f ./rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_Contents-amd64)" aptget files --format '$(FILENAME)' 'Created-By: Contents'
+testsuccess cmp 'rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_Contents-amd64' 'aptarchive/dists/unstable/main/Contents-amd64'
+
+# no automatic uncompress based on the name please,
+# only if we downloaded a compressed file, but target was uncompressed
+cat > rootdir/etc/apt/apt.conf.d/content-target.conf <<EOF
+APT::Acquire::Targets::deb::Contents {
+ MetaKey "\$(COMPONENT)/Contents-\$(ARCHITECTURE).gz";
+ ShortDescription "Contents.gz";
+ Description "\$(SITE) \$(RELEASE)/\$(COMPONENT) \$(ARCHITECTURE) Contents.gz";
+};
+EOF
+
+# the last line is utter bogus of course, but how should apt know…
+testequal "'http://localhost:8080/dists/unstable/InRelease' localhost:8080_dists_unstable_InRelease 0
+'http://localhost:8080/dists/unstable/main/source/Sources.bz2' localhost:8080_dists_unstable_main_source_Sources 0
+'http://localhost:8080/dists/unstable/main/binary-amd64/Packages.bz2' localhost:8080_dists_unstable_main_binary-amd64_Packages 0
+'http://localhost:8080/dists/unstable/main/i18n/Translation-en.bz2' localhost:8080_dists_unstable_main_i18n_Translation-en 0
+'http://localhost:8080/dists/unstable/main/Contents-amd64.gz.bz2' localhost:8080_dists_unstable_main_Contents-amd64.gz 0 " aptget update --print-uris
+
+testsuccessequal "Hit:1 http://localhost:8080 unstable InRelease
+Get:2 http://localhost:8080 unstable/main amd64 Contents.gz [$(stat -c%s aptarchive/dists/unstable/main/Contents-amd64.gz) B]
+Reading package lists..." aptget update
+
+testequal 'rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_Contents-amd64.gz' find rootdir/var/lib/apt/lists -name '*Contents*'
+testequal "$(readlink -f ./rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_Contents-amd64.gz)" aptget files --format '$(FILENAME)' 'Created-By: Contents'
+testsuccess cmp 'rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_Contents-amd64.gz' 'aptarchive/dists/unstable/main/Contents-amd64.gz'
+
+rm -f rootdir/etc/apt/apt.conf.d/content-target.conf
+
+testequal "'http://localhost:8080/dists/unstable/InRelease' localhost:8080_dists_unstable_InRelease 0
+'http://localhost:8080/dists/unstable/main/source/Sources.bz2' localhost:8080_dists_unstable_main_source_Sources 0
+'http://localhost:8080/dists/unstable/main/binary-amd64/Packages.bz2' localhost:8080_dists_unstable_main_binary-amd64_Packages 0
+'http://localhost:8080/dists/unstable/main/i18n/Translation-en.bz2' localhost:8080_dists_unstable_main_i18n_Translation-en 0 " aptget update --print-uris
+
+testsuccessequal "Hit:1 http://localhost:8080 unstable InRelease
+Reading package lists..." aptget update
+
+testempty find rootdir/var/lib/apt/lists -name '*Contents*'
diff --git a/test/integration/test-apt-by-hash-update b/test/integration/test-apt-by-hash-update
index d9d0b146f..2229e991d 100755
--- a/test/integration/test-apt-by-hash-update
+++ b/test/integration/test-apt-by-hash-update
@@ -11,8 +11,6 @@ insertpackage 'unstable' 'foo' 'all' '1.0'
setupaptarchive --no-update
-APTARCHIVE=$(readlink -f ./aptarchive)
-
# make Packages *only* accessable by-hash for this test
mkdir -p aptarchive/dists/unstable/main/binary-i386/by-hash/SHA512
(cd aptarchive/dists/unstable/main/binary-i386/by-hash/SHA512 &&
@@ -26,24 +24,28 @@ mkdir -p aptarchive/dists/unstable/main/source/by-hash/SHA512
)
# we moved the Packages file away, normal update won't work
-testfailure aptget upate
+testfailure aptget update
# ensure we do not know about "foo"
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
E: Unable to locate package foo" aptget install -q -s foo
# ensure we can apt-get update by hash
testsuccess aptget update -o APT::Acquire::By-Hash=1 -o Acquire::Languages=none
-# ensure it works
-testequal "Inst foo (1.0 unstable [all])
+ensureitworks() {
+ testsuccessequal "Inst foo (1.0 unstable [all])
Conf foo (1.0 unstable [all])" aptget install -qq -s foo
+}
+ensureitworks
# add magic string to Release file ...
MAGIC="Acquire-By-Hash: true"
sed -i "s#Suite: unstable#Suite: unstable\n$MAGIC#" aptarchive/dists/unstable/Release
signreleasefiles
# ... and verify that it fetches by hash now
+rm -rf rootdir/var/lib/apt/lists
testsuccess aptget update -o Acquire::Languages=none
+ensureitworks
diff --git a/test/integration/test-apt-cache b/test/integration/test-apt-cache
new file mode 100755
index 000000000..97dc0f939
--- /dev/null
+++ b/test/integration/test-apt-cache
@@ -0,0 +1,124 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'amd64' 'i386'
+
+DESCR='Some description
+ That has multiple lines'
+insertpackage 'unstable' 'fancy' 'all' '1'
+insertpackage 'unstable,installed' 'foo' 'all' '1' 'Depends: bar
+Conflicts: foobar
+Recommends: cool (>= 2) | cooler (<< 5)' "$DESCR"
+insertpackage 'unstable' 'bar' 'all' '1' 'Depends: bar
+Breaks: foo (<< 1)
+Replaces: foo (<< 1)' "$DESCR"
+
+setupaptarchive
+
+# dpkg is installed by our framework
+testdpkginstalled 'dpkg'
+testempty aptcache unmet dpkg
+
+# FIXME: Find some usecase for unmet as it seems kinda useless/broken
+#testsuccess aptcache unmet
+#testsuccess aptcache unmet foo
+
+# not too useful to test, but makes coverage green…
+testsuccess aptcache stats
+cp rootdir/tmp/testsuccess.output stats.output
+testsuccess test -s stats.output
+testsuccess aptcache xvcg foo
+cp rootdir/tmp/testsuccess.output xvcg.output
+testsuccess test -s xvcg.output
+testsuccess aptcache dotty foo
+cp rootdir/tmp/testsuccess.output dotty.output
+testsuccess test -s dotty.output
+# for this, even the sourcecode says it is useless (expect debugging)
+testsuccess aptcache dump
+cp rootdir/tmp/testsuccess.output dump.output
+testsuccess test -s dump.output
+
+testsuccessequal 'dpkg
+bar
+fancy
+foo' aptcache pkgnames
+testsuccessequal 'bar' aptcache pkgnames bar
+testsuccessequal 'fancy
+foo' aptcache pkgnames f
+
+testsuccessequal " foo | 1 | file:$(readlink -f .)/aptarchive unstable/main amd64 Packages" aptcache madison foo
+
+### depends
+
+testsuccessequal 'foo
+ Depends: bar
+ |Recommends: <cool>
+ Recommends: <cooler>
+ Conflicts: <foobar>
+ Conflicts: <foobar:i386>' aptcache depends foo
+testsuccessequal 'foo
+ Depends: bar
+ Recommends: <cool>
+ Conflicts: <foobar>
+ Conflicts: <foobar:i386>' aptcache depends foo -o APT::Cache::ShowOnlyFirstOr=1
+testsuccessequal 'foo
+ Depends: bar
+ |Recommends: <cool> (>= 2)
+ Recommends: <cooler> (<< 5)
+ Conflicts: <foobar>
+ Conflicts: <foobar:i386>' aptcache depends foo -o APT::Cache::ShowVersion=1
+testsuccessequal 'foo
+ Depends: bar
+ Conflicts: <foobar>
+ Conflicts: <foobar:i386>' aptcache depends foo --no-recommends
+testsuccessequal 'foo
+ Depends: bar' aptcache depends foo --important
+testsuccessequal 'foo
+ Conflicts: <foobar>
+ Conflicts: <foobar:i386>' aptcache depends foo --important --no-depends --conflicts
+testsuccessequal 'foo
+ Depends: bar
+ |Recommends: <cool>
+ Recommends: <cooler>
+ Conflicts: <foobar>
+ Conflicts: <foobar:i386>
+bar
+ Depends: bar
+ Breaks: foo
+ Breaks: <foo:i386>
+ Replaces: foo
+ Replaces: <foo:i386>
+<cool>
+<cooler>
+<foobar>
+<foobar:i386>
+<foo:i386>' aptcache depends foo --recurse
+testsuccessequal 'foo
+ Depends: bar
+bar
+ Depends: bar
+ Replaces: foo
+ Replaces: <foo:i386>
+<foo:i386>' aptcache depends foo --recurse --important --replaces
+
+## rdpends
+
+testsuccessequal 'foo
+Reverse Depends:
+ bar
+ bar' aptcache rdepends foo
+testsuccessequal 'foo
+Reverse Depends:
+ Replaces: bar
+ Breaks: bar' aptcache rdepends foo -o APT::Cache::ShowDependencyType=1
+testsuccessequal 'foo
+Reverse Depends:
+ Replaces: bar (<< 1)
+ Breaks: bar (<< 1)' aptcache rdepends foo -o APT::Cache::ShowDependencyType=1 -o APT::Cache::ShowVersion=1
+testsuccessequal 'foo
+Reverse Depends:
+ Breaks: bar (<< 1)' aptcache rdepends foo -o APT::Cache::ShowDependencyType=1 -o APT::Cache::ShowVersion=1 --important --breaks
diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom
index 3a33219fe..108805daa 100755
--- a/test/integration/test-apt-cdrom
+++ b/test/integration/test-apt-cdrom
@@ -33,6 +33,7 @@ aptcdromlog() {
test ! -e rootdir/media/cdrom || echo "CD-ROM is mounted, but shouldn't be!"
test -e rootdir/media/cdrom-unmounted || echo "Unmounted CD-ROM doesn't exist, but it should!"
}
+aptautotest_aptcdromlog_add() { aptautotest_aptget_update "$@"; }
CDROM_PRE="Using CD-ROM mount point $(readlink -f ./rootdir/media)/cdrom/
Unmounting CD-ROM...
@@ -49,12 +50,12 @@ deb-src cdrom:[Debian APT Testdisk 0.8.15]/ stable main
Unmounting CD-ROM...
Repeat this process for the rest of the CDs in your set."
-testequal "$CDROM_PRE
+testsuccessequal "$CDROM_PRE
Found 2 package indexes, 1 source indexes, 1 translation indexes and 1 signatures
Found label 'Debian APT Testdisk 0.8.15'
$CDROM_POST" aptcdromlog add
-testequal "Using CD-ROM mount point $(readlink -f ./rootdir/media)/cdrom/
+testsuccessequal "Using CD-ROM mount point $(readlink -f ./rootdir/media)/cdrom/
Mounting CD-ROM...
Stored label: Debian APT Testdisk 0.8.15
Unmounting CD-ROM..." aptcdromlog ident
@@ -63,13 +64,13 @@ Unmounting CD-ROM..." aptcdromlog ident
ident="$(LC_ALL=C aptcdrom ident 2>&1 )"
CD_ID="$(echo "$ident" | grep "^Identifying" | head -n1 | cut -d" " -f2 | tr --delete '[]')"
CD_LABEL="$(echo "$ident" | grep "^Stored label:" | head -n1 | sed "s/^[^:]*: //")"
-testequal "CD::${CD_ID} \"${CD_LABEL}\";
-CD::${CD_ID}::Label \"${CD_LABEL}\";" cat rootdir/var/lib/apt/cdroms.list
+testfileequal rootdir/var/lib/apt/cdroms.list "CD::${CD_ID} \"${CD_LABEL}\";
+CD::${CD_ID}::Label \"${CD_LABEL}\";"
testcdromusage() {
touch rootdir/var/lib/apt/extended_states
- testequal 'Reading package lists...
+ testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following NEW packages will be installed:
@@ -84,7 +85,7 @@ Conf testing (0.8.15 stable [amd64])' aptget install testing -s
testsuccess aptget purge testing -y
testdpkgnotinstalled testing
- testequal 'Reading package lists...
+ testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following NEW packages will be installed:
@@ -114,19 +115,18 @@ Conf testing:i386 (0.8.15 stable [i386])' aptget install testing:i386 -s
testcdromusage
# check Idempotence of apt-cdrom (and disabling of Translation dropping)
-testequal "$CDROM_PRE
+testsuccessequal "$CDROM_PRE
Found 2 package indexes, 1 source indexes, 2 translation indexes and 1 signatures
$CDROM_POST" aptcdromlog add -o APT::CDROM::DropTranslation=0
# take Translations from previous runs as needed
-testequal "$CDROM_PRE
+testsuccessequal "$CDROM_PRE
Found 2 package indexes, 1 source indexes, 2 translation indexes and 1 signatures
$CDROM_POST" aptcdromlog add
msgtest 'Test for the german description translation of' 'testing'
aptcache show testing -o Acquire::Languages=de | grep -q '^Description-de: ' && msgpass || msgfail
rm -rf rootdir/var/lib/apt/lists
-mkdir -p rootdir/var/lib/apt/lists/partial
-testequal "$CDROM_PRE
+testsuccessequal "$CDROM_PRE
Found 2 package indexes, 1 source indexes, 1 translation indexes and 1 signatures
$CDROM_POST" aptcdromlog add
msgtest 'Test for the english description translation of' 'testing'
@@ -134,18 +134,20 @@ aptcache show testing -o Acquire::Languages=en | grep -q '^Description-en: ' &&
# ensure cdrom method isn't trying to mount the cdrom
mv rootdir/media/cdrom-unmounted rootdir/media/cdrom-ejected
-# ensure an update doesn't mess with cdrom sources
+msgmsg "ensure an update doesn't mess with cdrom sources"
testsuccess aptget update
-testfileequal rootdir/tmp/testsuccess.output 'Reading package lists...'
+testfileequal rootdir/tmp/testsuccess.output 'Hit:1 cdrom://Debian APT Testdisk 0.8.15 stable InRelease
+Reading package lists...'
mv rootdir/media/cdrom-ejected rootdir/media/cdrom-unmounted
testcdromusage
-# and again to check that it withstands the temptation even if it could mount
+msgmsg 'and again to check that it withstands the temptation even if it could mount'
testsuccess aptget update
-testfileequal rootdir/tmp/testsuccess.output 'Reading package lists...'
+testfileequal rootdir/tmp/testsuccess.output 'Hit:1 cdrom://Debian APT Testdisk 0.8.15 stable InRelease
+Reading package lists...'
testcdromusage
msgmsg 'Check that nothing touched our' 'CD-ROM'
for file in $(find rootdir/media/cdrom-unmounted/dists); do
- testfilestats "$file" '%U:%G:%a' '=' "${USER}:${USER}:555"
+ testfilestats "$file" '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:555"
done
diff --git a/test/integration/test-apt-cli-list b/test/integration/test-apt-cli-list
index 1487afd55..d3c44e126 100755
--- a/test/integration/test-apt-cli-list
+++ b/test/integration/test-apt-cli-list
@@ -27,50 +27,49 @@ setupaptarchive
APTARCHIVE=$(readlink -f ./aptarchive)
-testequal "Listing...
+testsuccessequal "Listing...
bar/now 1.0 i386 [installed,local]
baz/unstable 2.0 all [upgradable from: 0.1]
foo/unstable 1.0 all
foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list
-testequal "Listing...
+testsuccessequal "Listing...
foo/unstable 1.0 all
foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list "foo*"
-testequal "Listing...
+testsuccessequal "Listing...
baz/unstable 2.0 all [upgradable from: 0.1]
foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list --upgradable
# FIXME: hm, hm - does it make sense to have this different? shouldn't
# we use "installed,upgradable" consitently?
-testequal "Listing...
+testsuccessequal "Listing...
bar/now 1.0 i386 [installed,local]
baz/now 0.1 all [installed,upgradable to: 2.0]
foobar/now 1.0 i386 [installed,upgradable to: 2.0]" apt list --installed
-testequal "Listing...
+testsuccessequal "Listing...
bar/now 1.0 i386 [installed,local]
foobar/unstable 2.0 i386 [upgradable from: 1.0]
foobar/now 1.0 i386 [installed,upgradable to: 2.0]
" apt list bar foobar --all-versions
-testequal "Listing...
+testsuccessequal "Listing...
bar/now 1.0 i386 [installed,local]
an autogenerated dummy bar=1.0/installed
" apt list bar --verbose
# test for dpkg ^rc state
insertinstalledpackage 'conf-only' 'i386' '1.0' '' '' 'deinstall ok config-files'
-testequal "Listing...
+testsuccessequal "Listing...
conf-only/now 1.0 i386 [residual-config]" apt list conf-only
# ensure that the users learns about multiple versions too
-testequal "Listing...
+testsuccessequal "Listing...
baz/unstable 2.0 all [upgradable from: 0.1]
N: There are 2 additional versions. Please use the '-a' switch to see them." apt list baz -o quiet=0
# test format strings for machine parseable output
-apt list -qq bar baz -o APT::Cmd::use-format=true -o APT::Cmd::format="\${Package} - \${installed:Version} - \${candidate:Version}" > output.txt
-testequal "bar - 1.0 - 1.0
-baz - 0.1 - 2.0" cat output.txt
+testsuccessequal 'bar - 1.0 - 1.0
+baz - 0.1 - 2.0' apt list -qq bar baz -o APT::Cmd::use-format=true -o APT::Cmd::format="\${Package} - \${installed:Version} - \${candidate:Version}"
diff --git a/test/integration/test-apt-cli-search b/test/integration/test-apt-cli-search
index 8f009d57c..e86661dcb 100755
--- a/test/integration/test-apt-cli-search
+++ b/test/integration/test-apt-cli-search
@@ -25,48 +25,51 @@ setupaptarchive
APTARCHIVE=$(readlink -f ./aptarchive)
+testfailureequal 'E: You must give at least one search pattern' aptcache search
+testfailureequal 'E: You must give at least one search pattern' apt search
+
# with OP progress
-testequal "Sorting...
+testsuccessequal "Sorting...
Full Text Search...
foo/unstable 1.0 all
$DESCR
" apt search xxyyzz
# without op progress
-testequal "foo/unstable 1.0 all
+testsuccessequal "foo/unstable 1.0 all
$DESCR
" apt search -qq xxyyzz
testempty apt search -qq --names-only xxyyzz
# search name
-testequal "foo/unstable 1.0 all
+testsuccessequal "foo/unstable 1.0 all
$DESCR
" apt search -qq foo
-testequal "foo/unstable 1.0 all
+testsuccessequal "foo/unstable 1.0 all
$DESCR
" apt search -qq --names-only foo
# search with multiple words is a AND search
-testequal "foo/unstable 1.0 all
+testsuccessequal "foo/unstable 1.0 all
$DESCR
" apt search -qq aabbcc xxyyzz
-testequal "foo/unstable 1.0 all
+testsuccessequal "foo/unstable 1.0 all
$DESCR
" apt search -qq 'a+b+c+' 'i*xxy{0,2}zz'
# search is not case-sensitive by default
-testequal "foo/unstable 1.0 all
+testsuccessequal "foo/unstable 1.0 all
$DESCR
" apt search -qq uppercase
-testequal "foo/unstable 1.0 all
+testsuccessequal "foo/unstable 1.0 all
$DESCR
" apt search -qq 'up[pP]erc[Aa]se'
# search is done in the long description
-testequal "foo/unstable 1.0 all
+testsuccessequal "foo/unstable 1.0 all
$DESCR
" apt search -qq 'long description'
-testequal "foo/unstable 1.0 all
+testsuccessequal "foo/unstable 1.0 all
$DESCR
Long description of stuff and such, with lines
.
@@ -74,7 +77,7 @@ testequal "foo/unstable 1.0 all
" apt search --full -qq 'long description'
# output is sorted and search word finds both package
-testequal "bar/testing 2.0 i386
+testsuccessequal "bar/testing 2.0 i386
$DESCR2
foo/unstable 1.0 all
diff --git a/test/integration/test-apt-cli-show b/test/integration/test-apt-cli-show
index 4c8e134d6..5f4ef1b48 100755
--- a/test/integration/test-apt-cli-show
+++ b/test/integration/test-apt-cli-show
@@ -24,15 +24,26 @@ APTARCHIVE=$(readlink -f ./aptarchive)
# note that we do not display Description-md5 with the "apt" cmd
# and also show some additional fields that are calculated
-testequal "Package: foo
+testsuccessequal "Package: foo
+Version: 1.0
Priority: optional
Section: other
-Installed-Size: 43.0 kB
Maintainer: Joe Sixpack <joe@example.org>
-Version: 1.0
+Installed-Size: 43.0 kB
Download-Size: unknown
APT-Manual-Installed: yes
-APT-Sources: file:$APTARCHIVE/ unstable/main i386 Packages
+APT-Sources: file:$APTARCHIVE unstable/main i386 Packages
Description: Some description
That has multiple lines
" apt show foo
+
+# this is the default, but disabled by the testcases
+testsuccess apt show foo -o Apt::Cmd::Disable-Script-Warning=0
+cp rootdir/tmp/testsuccess.output aptshow.output
+testsuccess grep '^WARNING: ' aptshow.output
+
+if [ "$(id -u)" != '0' ]; then
+ testsuccess apt install foo -s -o APT::Get::Show-User-Simulation-Note=1
+ cp rootdir/tmp/testsuccess.output aptshow.output
+ testsuccess grep '^NOTE: ' aptshow.output
+fi
diff --git a/test/integration/test-apt-cli-update b/test/integration/test-apt-cli-update
index 987bb9adb..d68ab25e4 100755
--- a/test/integration/test-apt-cli-update
+++ b/test/integration/test-apt-cli-update
@@ -8,10 +8,17 @@ setupenvironment
configarchitecture "i386"
insertpackage 'unstable' 'foo' 'all' '2.0'
+cp rootdir/var/lib/dpkg/status dpkg.status
insertinstalledpackage 'foo' 'all' '1.0'
setupaptarchive --no-update
APTARCHIVE=$(readlink -f ./aptarchive)
-testequal "1 package can be upgraded. Run 'apt list --upgradable' to see it." apt update -q
+testfailureequal 'E: The update command takes no arguments' apt update -q arguments
+
+testsuccessequal "1 package can be upgraded. Run 'apt list --upgradable' to see it." apt update -q
+
+cp dpkg.status rootdir/var/lib/dpkg/status
+insertinstalledpackage 'foo' 'all' '2.0'
+testsuccessequal 'All packages are up to date.' apt update -q
diff --git a/test/integration/test-apt-cli-upgrade b/test/integration/test-apt-cli-upgrade
index b6ee2270b..54f2ecd11 100755
--- a/test/integration/test-apt-cli-upgrade
+++ b/test/integration/test-apt-cli-upgrade
@@ -23,7 +23,7 @@ setupaptarchive
APTARCHIVE=$(readlink -f ./aptarchive)
# default is to allow new dependencies
-testequal "The following NEW packages will be installed:
+testsuccessequal "The following NEW packages will be installed:
foo-new-dependency
The following packages will be upgraded:
foo
@@ -33,7 +33,7 @@ Inst foo [1.0] (2.0 unstable [all])
Conf foo-new-dependency (2.0 unstable [all])
Conf foo (2.0 unstable [all])" apt upgrade -qq -s
-# ensure
-testequal "The following packages have been kept back:
+# ensure the 'old' way works as well
+testsuccessequal "The following packages have been kept back:
foo
0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded." apt upgrade -qq -s --no-new-pkgs
diff --git a/test/integration/test-apt-config b/test/integration/test-apt-config
new file mode 100755
index 000000000..2eea9a0f8
--- /dev/null
+++ b/test/integration/test-apt-config
@@ -0,0 +1,36 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'amd64'
+
+testsuccess aptconfig dump
+testsuccessequal 'APT::Architecture "amd64";' aptconfig dump APT::Architecture
+testempty aptconfig dump config::which::does::not::exist
+
+testsuccessequal 'APT::Architectures "";
+APT::Architectures:: "amd64";' aptconfig dump APT::Architectures
+testsuccessequal 'APT::Architectures:: "amd64";' aptconfig dump --no-empty APT::Architectures
+testsuccessequal 'amd64' aptconfig dump --no-empty --format='%v%n' APT::Architectures
+
+testempty aptconfig shell
+testfailureequal 'E: Arguments not in pairs' aptconfig shell APT::Architecture
+testempty aptconfig shell APT::Architecture ARCH # incorrect order
+testsuccessequal "ARCH='amd64'" aptconfig shell ARCH APT::Architecture
+
+ROOTDIR="$(readlink -f rootdir)"
+testsuccessequal "CONFIG='apt.conf'" aptconfig shell CONFIG Dir::Etc::main
+testsuccessequal "CONFIG='${ROOTDIR}/etc/apt/apt.conf'" aptconfig shell CONFIG Dir::Etc::main/f
+testsuccessequal "CONFIG='etc/apt/'" aptconfig shell CONFIG Dir::Etc
+testsuccessequal "CONFIG='${ROOTDIR}/etc/apt/'" aptconfig shell CONFIG Dir::Etc/ # old style
+testsuccessequal "CONFIG='${ROOTDIR}/etc/apt/'" aptconfig shell CONFIG Dir::Etc/d
+
+testempty aptconfig dump --no-empty --format='%v%n' APT::Build-Profiles
+export DEB_BUILD_PROFILES='nodoc stage1'
+testsuccessequal 'nodoc
+stage1' aptconfig dump --no-empty --format='%v%n' APT::Build-Profiles
+unset DEB_BUILD_PROFILES
+testempty aptconfig dump --no-empty --format='%v%n' APT::Build-Profiles
diff --git a/test/integration/test-apt-download-progress b/test/integration/test-apt-download-progress
new file mode 100755
index 000000000..7caeca971
--- /dev/null
+++ b/test/integration/test-apt-download-progress
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# ensure downloading sends progress as a regression test for commit 9127d7ae
+#
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+changetohttpswebserver
+
+assertprogress() {
+ T="$1"
+ testsuccess grep "dlstatus:1:0:Retrieving file 1 of 1" "$T"
+ if ! egrep -q "dlstatus:1:[1-9][0-9](\..*)?:Retrieving file 1 of 1" "$T"; then
+ cat "$T"
+ msgfail "Failed to detect download progress"
+ fi
+ testsuccess grep "dlstatus:1:100:Retrieving file 1 of 1" "$T"
+}
+
+# we need to ensure the file is reasonable big so that apt has a chance to
+# actually report progress - but not too big to ensure its not delaying the
+# test too much
+TESTFILE=testfile.big
+testsuccess dd if=/dev/zero of=./aptarchive/$TESTFILE bs=800k count=1
+
+OPT='-o APT::Status-Fd=3 -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::http=1 -o Debug::Acquire::https=1'
+
+msgtest 'download progress works via' 'http'
+exec 3> apt-progress.log
+testsuccess --nomsg apthelper download-file "http://localhost:8080/$TESTFILE" ./downloaded/http-$TESTFILE $OPT -o Acquire::http::Dl-Limit=800
+assertprogress apt-progress.log
+
+msgtest 'download progress works via' 'https'
+exec 3> apt-progress.log
+testsuccess --nomsg apthelper download-file "https://localhost:4433/$TESTFILE" ./downloaded/https-$TESTFILE $OPT -o Acquire::https::Dl-Limit=800
+assertprogress apt-progress.log
+
+# cleanup
+rm -f apt-progress*.log
diff --git a/test/integration/test-apt-extracttemplates b/test/integration/test-apt-extracttemplates
index ae2cc8bc2..5dadc4933 100755
--- a/test/integration/test-apt-extracttemplates
+++ b/test/integration/test-apt-extracttemplates
@@ -8,38 +8,63 @@ setupenvironment
configarchitecture 'amd64'
# apt-extracttemplates needs this
-insertinstalledpackage 'debconf' 'amd64' '1.5'
insertinstalledpackage 'pkg-with-template' 'amd64' '1.0'
# build a simple package that contains a config and a tempalte
mkdir -p DEBIAN
-TEMPLATE_STR="Template: foo/bar
-Type: string
-Description: Some bar var
-"
-echo "$TEMPLATE_STR" > DEBIAN/templates
-
CONFIG_STR="#!/bin/sh
random shell stuff
"
echo "$CONFIG_STR" > DEBIAN/config
-buildsimplenativepackage 'pkg-with-template' 'amd64' '0.8.15' 'stable' '' 'pkg with template' '' '' './DEBIAN'
+testrun() {
+ local TEMPLATE_STR='Template: foo/bar
+Type: string
+Description: Some bar var
+'
+ echo "$TEMPLATE_STR" > DEBIAN/templates
+ buildsimplenativepackage "$1" 'amd64' '0.8.15' 'stable' "$2" 'pkg with template' '' '' './DEBIAN'
+
+ cp dpkg.status rootdir/var/lib/dpkg/status
+ insertinstalledpackage 'debconf' 'amd64' '3'
+
+ # ensure we get the right stuff out of the file
+ rm -rf extracttemplates-out rootdir/var/cache/apt
+ mkdir extracttemplates-out
+ testsuccess aptextracttemplates -t ./extracttemplates-out incoming/${1}*.deb
+ OUT='rootdir/tmp/testsuccess.output'
+ testequal "$1" cut -f1 -d' ' $OUT
+ if [ -n "$2" ]; then
+ testequal '' cut -s -f2 -d' ' $OUT
+ else
+ testequal '1.0' cut -f2 -d' ' $OUT
+ fi
+ TEMPLATE=$(cut -f3 -d' ' $OUT)
+ testfileequal "$TEMPLATE" "$TEMPLATE_STR"
+ CONFIG=$(cut -f4 -d' ' $OUT)
+ testfileequal "$CONFIG" "$CONFIG_STR"
-# ensure we get the right stuff out of the file
-mkdir extracttemplates-out
-OUT="$(aptextracttemplates -t ./extracttemplates-out incoming/pkg-with-template*.deb)"
+ # ensure that the format of the output string has the right number of dots
+ for s in "$CONFIG" "$TEMPLATE"; do
+ NR_DOTS=$(basename "$s" | tr -c -d '.')
+ testequal '..' echo $NR_DOTS
+ done
-PKG=$(printf "$OUT" | cut -f1 -d' ')
-INSTALLED_VER=$(printf "$OUT" | cut -f2 -d' ')
-TEMPLATE=$(printf "$OUT" | cut -f3 -d' ')
-CONFIG=$(printf "$OUT" | cut -f4 -d' ')
+ if [ -n "$2" ]; then
+ rm -rf extracttemplates-out rootdir/var/cache/apt
+ mkdir extracttemplates-out
+ cp dpkg.status rootdir/var/lib/dpkg/status
+ insertinstalledpackage 'debconf' 'amd64' '1'
+ testempty aptextracttemplates -t ./extracttemplates-out incoming/${1}*.deb
+ fi
+}
-testequal "$CONFIG_STR" cat $CONFIG
-testequal "$TEMPLATE_STR" cat $TEMPLATE
+cp rootdir/var/lib/dpkg/status dpkg.status
+testrun 'pkg-with-template' ''
+testrun 'pkg-with-template-depends' 'Depends: debconf (>= 2)'
+testrun 'pkg-with-template-predepends' 'Pre-Depends: debconf (>= 2)'
-# ensure that the format of the output string has the right number of dots
-for s in "$CONFIG" "$TEMPLATE"; do
- NR_DOTS=$(basename "$s" | tr -c -d .)
- testequal ".." echo $NR_DOTS
-done
+# test with no debconf installed
+cp dpkg.status rootdir/var/lib/dpkg/status
+testfailure aptextracttemplates -t ./extracttemplates-out incoming/pkg-with-template-depends*.deb
+testfileequal 'rootdir/tmp/testfailure.output' 'E: Cannot get debconf version. Is debconf installed?'
diff --git a/test/integration/test-apt-ftparchive-cachedb b/test/integration/test-apt-ftparchive-cachedb
index 0e1986bcd..962095320 100755
--- a/test/integration/test-apt-ftparchive-cachedb
+++ b/test/integration/test-apt-ftparchive-cachedb
@@ -3,20 +3,20 @@ set -e
ensure_correct_packages_file() {
testequal "Package: foo
+Architecture: i386
+Version: 1
Priority: optional
Section: others
-$(dpkg-deb -I ./aptarchive/pool/main/foo_1_i386.deb | grep 'Installed-Size:' | sed 's#^ ##')
Maintainer: Joe Sixpack <joe@example.org>
-Architecture: i386
-Version: 1
-Filename: pool/main/foo_1_i386.deb" head -n8 ./aptarchive/dists/test/main/binary-i386/Packages
+$(dpkg-deb -I ./aptarchive/pool/main/foo_1_i386.deb | grep 'Installed-Size:' | sed 's#^ ##')
+Filename: pool/main/foo_1_i386.deb" head -n8 ./aptarchive/dists/test/main/binary-i386/Packages
}
ensure_correct_contents_file() {
- testequal "usr/bin/foo-i386 others/foo
+ testfileequal ./aptarchive/dists/test/Contents-i386 "usr/bin/foo-i386 others/foo
usr/share/doc/foo/FEATURES others/foo
usr/share/doc/foo/changelog others/foo
-usr/share/doc/foo/copyright others/foo" cat ./aptarchive/dists/test/Contents-i386
+usr/share/doc/foo/copyright others/foo"
}
#
@@ -69,32 +69,38 @@ buildsimplenativepackage 'foo' 'i386' '1' 'test'
mv incoming/* aptarchive/pool/main/
# generate (empty cachedb)
-aptftparchive generate ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1 2> stats-out.txt
+testsuccess aptftparchive generate ftparchive.conf -q=0 -o APT::FTPArchive::ShowCacheMisses=1
+cp rootdir/tmp/testsuccess.output stats-out.txt
ensure_correct_packages_file
ensure_correct_contents_file
-testequal " Misses in Cache: 2
- dists/test/Contents-i386: New 402 B Misses in Cache: 0" grep Misses stats-out.txt
+testsuccess grep Misses stats-out.txt
+testfileequal 'rootdir/tmp/testsuccess.output' ' Misses in Cache: 2
+ dists/test/Contents-i386: New 402 B Misses in Cache: 0'
# generate again
-aptftparchive generate ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1 2> stats-out.txt
+testsuccess aptftparchive generate ftparchive.conf -q=0 -o APT::FTPArchive::ShowCacheMisses=1
+cp rootdir/tmp/testsuccess.output stats-out.txt
ensure_correct_packages_file
ensure_correct_contents_file
-testequal " Misses in Cache: 0
- dists/test/Contents-i386: Misses in Cache: 0" grep Misses stats-out.txt
+testsuccess grep Misses stats-out.txt
+testfileequal 'rootdir/tmp/testsuccess.output' ' Misses in Cache: 0
+ dists/test/Contents-i386: Misses in Cache: 0'
# and again (with removing the Packages file)
rm -f ./aptarchive/dists/test/main/binary-i386/*
rm -f ./aptarchive/dists/test/Contents-i386
-aptftparchive generate ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1 2> stats-out.txt
+testsuccess aptftparchive generate ftparchive.conf -q=0 -o APT::FTPArchive::ShowCacheMisses=1
+cp rootdir/tmp/testsuccess.output stats-out.txt
ensure_correct_packages_file
ensure_correct_contents_file
-testequal " Misses in Cache: 0
- dists/test/Contents-i386: New 402 B Misses in Cache: 0" grep Misses stats-out.txt
+testsuccess grep Misses stats-out.txt
+testfileequal 'rootdir/tmp/testsuccess.output' ' Misses in Cache: 0
+ dists/test/Contents-i386: New 402 B Misses in Cache: 0'
# and clean
rm -rf aptarchive/pool/main/*
-testequal "packages-main-i386.db" aptftparchive clean ftparchive.conf
-aptftparchive clean ftparchive.conf -o Debug::APT::FTPArchive::Clean=1 > clean-out.txt 2>&1
-testequal "0 Number of unique keys in the tree" grep unique clean-out.txt
-testequal "packages-main-i386.db" grep packages-main-i386.db clean-out.txt
-
+testsuccessequal "packages-main-i386.db" aptftparchive clean ftparchive.conf -q=0
+testsuccess aptftparchive clean ftparchive.conf -q=0 -o Debug::APT::FTPArchive::Clean=1
+cp rootdir/tmp/testsuccess.output clean-out.txt
+testsuccessequal "0 Number of unique keys in the tree" grep unique clean-out.txt
+testsuccessequal "packages-main-i386.db" grep packages-main-i386.db clean-out.txt
diff --git a/test/integration/test-apt-ftparchive-cachedb-lp1274466 b/test/integration/test-apt-ftparchive-cachedb-lp1274466
index 579ae33a6..8b768441a 100755
--- a/test/integration/test-apt-ftparchive-cachedb-lp1274466
+++ b/test/integration/test-apt-ftparchive-cachedb-lp1274466
@@ -26,13 +26,13 @@ testsuccess grep 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc
testfailure grep 7da58ff901a40ecf42a730dc33198b182e9ba9ec98799fc2c2b6fabeeee40cc12a0e7cadb4b66764235c56e1009dbfe8a9a566fb1eedf47a992d1fff2cc3332c old-format.dump
# regression test for corruption with previous generation of cachedb
-testequal "Package: foo
+testsuccessequal "Package: foo
+Architecture: i386
+Version: 1
Priority: optional
Section: others
-Installed-Size: 29
Maintainer: Joe Sixpack <joe@example.org>
-Architecture: i386
-Version: 1
+Installed-Size: 29
Filename: ./foo_1_i386.deb
Size: 1270
MD5sum: 85d0e908c1a897700e2c5dea72d7e3c0
diff --git a/test/integration/test-apt-ftparchive-src-cachedb b/test/integration/test-apt-ftparchive-src-cachedb
index e7b148530..66a3b7845 100755
--- a/test/integration/test-apt-ftparchive-src-cachedb
+++ b/test/integration/test-apt-ftparchive-src-cachedb
@@ -2,17 +2,17 @@
set -e
assert_correct_sources_file() {
- testequal "Package: bar
+ testsuccessequal "Package: bar
+Format: 3.0 (native)
+Binary: bar
Architecture: all
Version: 1.0
-Binary: bar
-Format: 3.0 (native)
Directory: pool/main
+Package-List:
+ bar deb admin extra
Files:
7b57dd065e51de5905288a5104d4bef5 406 bar_1.0.dsc
d41d8cd98f00b204e9800998ecf8427e 0 bar_1.0.tar.gz
-Package-List:
- bar deb admin extra
Checksums-Sha1:
17a40b76715f393ab7fd6485c9392a02f1adf903 406 bar_1.0.dsc
da39a3ee5e6b4b0d3255bfef95601890afd80709 0 bar_1.0.tar.gz
@@ -24,16 +24,16 @@ Checksums-Sha512:
cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e 0 bar_1.0.tar.gz
Package: foo
+Format: 3.0 (native)
+Binary: foo
Architecture: all
Version: 1.0
-Binary: foo
-Format: 3.0 (native)
Directory: pool/main
+Package-List:
+ foo deb admin extra
Files:
d144826e6f02831c1933e910c92cd7e0 171 foo_1.0.dsc
d41d8cd98f00b204e9800998ecf8427e 0 foo_1.0.tar.gz
-Package-List:
- foo deb admin extra
Checksums-Sha1:
979306aa3ccff3d61bba062bb6977e2493c6f907 171 foo_1.0.dsc
da39a3ee5e6b4b0d3255bfef95601890afd80709 0 foo_1.0.tar.gz
@@ -43,7 +43,7 @@ Checksums-Sha256:
Checksums-Sha512:
3da0240fd764657c2f3661b4d750578a9a99b0580591b133756379d48117ebda87a5ed2467f513200d6e7eaf51422cbe91c15720eef7fb4bba2cc8ff81ebc547 171 foo_1.0.dsc
cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e 0 foo_1.0.tar.gz
-" aptsortpkgs ./aptarchive/dists/test/main/source/Sources
+" aptsortpkgs ./aptarchive/dists/test/main/source/Sources -o APT::SortPkgs::Source=true
}
create_source_files() {
@@ -106,28 +106,22 @@ mkdir -p aptarchive/dists/test/main/source/
mkdir aptarchive-overrides
mkdir aptarchive-cache
-
-
-# generate with --db option
-(cd aptarchive && aptftparchive --db ./test.db sources pool/main/ \
- -o APT::FTPArchive::ShowCacheMisses=1 \
- > dists/test/main/source/Sources \
- 2> stats-out.txt
- testequal " Misses in Cache: 2" grep Misses stats-out.txt
-)
+msgtest 'generate with --db option'
+cd aptarchive
+aptftparchive --db ./test.db sources pool/main/ -q=0 -o APT::FTPArchive::ShowCacheMisses=1 > dists/test/main/source/Sources 2>stats-out.txt && msgpass || msgfail
+testsuccess grep Misses stats-out.txt
+testfileequal '../rootdir/tmp/testsuccess.output' ' Misses in Cache: 2'
+cd ..
assert_correct_sources_file
-# generate with --db option (again to ensure its in the cache)
-(cd aptarchive && aptftparchive --db ./test.db sources pool/main/ \
- -o APT::FTPArchive::ShowCacheMisses=1 \
- > dists/test/main/source/Sources \
- 2> stats-out.txt
- testequal " Misses in Cache: 0" grep Misses stats-out.txt
-)
+msgtest 'generate with --db option (again to ensure its in the cache)'
+cd aptarchive
+aptftparchive --db ./test.db sources pool/main/ -q=0 -o APT::FTPArchive::ShowCacheMisses=1 > dists/test/main/source/Sources 2>stats-out.txt && msgpass || msgfail
+testsuccess grep Misses stats-out.txt
+testfileequal '../rootdir/tmp/testsuccess.output' ' Misses in Cache: 0'
+cd ..
assert_correct_sources_file
-
-
# get ready for the "apt-ftparchive generate" command
cat > apt-ftparchive.conf <<"EOF"
Dir {
@@ -159,20 +153,21 @@ Tree "dists/test" {
};
EOF
-# generate (empty cachedb)
-aptftparchive generate apt-ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1 2> stats-out.txt
-testequal " Misses in Cache: 2" grep Misses stats-out.txt
+msgtest 'generate (empty cachedb)'
+testsuccess aptftparchive generate apt-ftparchive.conf -q=0 -o APT::FTPArchive::ShowCacheMisses=1
+cp rootdir/tmp/testsuccess.output stats-out.txt
+testsuccess grep Misses stats-out.txt
+testfileequal rootdir/tmp/testsuccess.output ' Misses in Cache: 2'
assert_correct_sources_file
-
-# generate again out of the cache
+msgtest 'generate again out of the cache'
rm -f ./aptarchive/dists/test/main/source/Sources
-aptftparchive generate apt-ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1 2> stats-out.txt
-testequal " Misses in Cache: 0" grep Misses stats-out.txt
+testsuccess aptftparchive generate apt-ftparchive.conf -q=0 -o APT::FTPArchive::ShowCacheMisses=1
+cp rootdir/tmp/testsuccess.output stats-out.txt
+testsuccess grep Misses stats-out.txt
+testfileequal rootdir/tmp/testsuccess.output ' Misses in Cache: 0'
assert_correct_sources_file
-
-
# generate invalid files
mkdir aptarchive/pool/invalid
printf "meep" > aptarchive/pool/invalid/invalid_1.0.dsc
@@ -185,14 +180,11 @@ testequal "
E: Could not find a Source entry in the DSC 'aptarchive/pool/invalid/invalid_1.0.dsc'" aptftparchive sources aptarchive/pool/invalid
rm -f aptarchive/pool/invalid/invalid_1.0.dsc
-dd if=/dev/zero of="aptarchive/pool/invalid/toobig_1.0.dsc" bs=1k count=129 2>/dev/null
-testequal "
-E: DSC file 'aptarchive/pool/invalid/toobig_1.0.dsc' is too large!" aptftparchive sources aptarchive/pool/invalid
-
# ensure clean works
rm -f aptarchive/pool/main/*
-aptftparchive clean apt-ftparchive.conf -o Debug::APT::FTPArchive::Clean=1 > clean-out.txt 2>&1
-testequal "0 Number of unique keys in the tree" grep unique clean-out.txt
-testequal "sources-main.db" grep sources-main.db clean-out.txt
-
-
+testsuccess aptftparchive clean apt-ftparchive.conf -q=0 -o Debug::APT::FTPArchive::Clean=1
+cp rootdir/tmp/testsuccess.output clean-out.txt
+testsuccess grep unique clean-out.txt
+testfileequal 'rootdir/tmp/testsuccess.output' "0 Number of unique keys in the tree"
+testsuccess grep sources-main.db clean-out.txt
+testfileequal 'rootdir/tmp/testsuccess.output' "sources-main.db"
diff --git a/test/integration/test-apt-get-autoremove b/test/integration/test-apt-get-autoremove
index acde4b096..a0e4d3c24 100755
--- a/test/integration/test-apt-get-autoremove
+++ b/test/integration/test-apt-get-autoremove
@@ -20,7 +20,7 @@ testdpkgnotinstalled 'debhelper'
testdpkginstalled 'po-debconf' 'unrelated'
echo 'APT::NeverAutoRemove { "^debc.*nf$"; };' > rootdir/etc/apt/apt.conf.d/00autoremove
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following packages will be REMOVED:
@@ -55,7 +55,7 @@ testdpkginstalled 'unrelated' 'debhelper' 'po-debconf'
testsuccess aptmark auto debhelper
testmarkedauto 'debhelper' 'po-debconf'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following packages will be REMOVED:
@@ -65,7 +65,7 @@ Remv debhelper [8.0.0]
Remv po-debconf [1.0.16]' aptget autoremove -s
testsuccess aptmark hold debhelper
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget autoremove -s
diff --git a/test/integration/test-apt-get-build-dep b/test/integration/test-apt-get-build-dep
index 87ec6e54d..f7af5b782 100755
--- a/test/integration/test-apt-get-build-dep
+++ b/test/integration/test-apt-get-build-dep
@@ -32,7 +32,7 @@ Files:
1e806d32233af87437258d86b1561f57 2036 2vcard_0.5-3.diff.gz
EOF
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Note, using file '2vcard_0.5-3.dsc' to get the build dependencies
The following NEW packages will be installed:
@@ -75,7 +75,7 @@ z2UAn1oXgTai6opwhVfkxrlmJ+iRxzuc
-----END PGP SIGNATURE-----
EOF
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Note, using file '2vcard_0.5-3.dsc' to get the build dependencies
The following NEW packages will be installed:
@@ -117,7 +117,7 @@ Description: install packages using the apt protocol - common data
EOF
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Note, using directory './foo-1.0' to get the build dependencies
The following NEW packages will be installed:
diff --git a/test/integration/test-apt-get-changelog b/test/integration/test-apt-get-changelog
index 648dccf40..5fa8543b9 100755
--- a/test/integration/test-apt-get-changelog
+++ b/test/integration/test-apt-get-changelog
@@ -5,44 +5,98 @@ TESTDIR=$(readlink -f $(dirname $0))
. $TESTDIR/framework
setupenvironment
-configarchitecture "i386"
+configarchitecture 'native'
-buildsimplenativepackage 'apt' 'all' '1.0' 'stable'
+buildsimplenativepackage 'foo' 'all' '1.0' 'stable'
+buildsimplenativepackage 'libbar' 'all' '1.0' 'stable'
+
+getlabelfromsuite() { echo 'Testcases'; }
+getoriginfromsuite() { echo 'Debian'; }
setupaptarchive --no-update
changetowebserver
testsuccess aptget update
-# simulate normal user with non-existent root-owned directories
-rm -rf rootdir/var/cache/apt/archives/
-mkdir rootdir/var/cache/apt/archives/
-addtrap 'prefix' "chmod -f -R +w $PWD/rootdir/var/cache/apt/archives || true;"
-chmod -R -w rootdir/var/cache/apt/archives
+testsuccessequal "'http://metadata.ftp-master.debian.org/changelogs/main/f/foo/foo_1.0_changelog' foo.changelog
+'http://metadata.ftp-master.debian.org/changelogs/main/libb/libbar/libbar_1.0_changelog' libbar.changelog" aptget changelog foo libbar --print-uris
+
+releasechanger() {
+ # modifying the Release files in lists… bad stuff. Good that this is only a test…
+ sed -i "s#^${1}: .*#${1}: ${2}#" $(find rootdir/var/lib/apt/lists -name '*Release')
+ rm -f rootdir/var/cache/apt/*.bin
+}
+releasechanger 'Origin' 'Ubuntu'
+testsuccessequal "'http://changelogs.ubuntu.com/changelogs/pool/main/f/foo/foo_1.0/changelog' foo.changelog
+'http://changelogs.ubuntu.com/changelogs/pool/main/libb/libbar/libbar_1.0/changelog' libbar.changelog" aptget changelog foo libbar --print-uris
+
+releasechanger 'Label' 'Debian'
+testsuccessequal "'http://changelogs.ubuntu.com/changelogs/pool/main/f/foo/foo_1.0/changelog' foo.changelog
+'http://changelogs.ubuntu.com/changelogs/pool/main/libb/libbar/libbar_1.0/changelog' libbar.changelog" aptget changelog foo libbar --print-uris
+
+testsuccessequal "'http://localhost:8080/main/f/foo/foo_1.0.changelog' foo.changelog
+'http://localhost:8080/main/libb/libbar/libbar_1.0.changelog' libbar.changelog" aptget changelog foo libbar --print-uris -o Acquire::Changelogs::URI::Label::Debian='http://localhost:8080/CHANGEPATH.changelog'
+
+sed -i '/^Origin: / a\
+Changelogs: http://example.org/CHANGEPATH-changelog' $(find rootdir/var/lib/apt/lists -name '*Release')
+rm -f rootdir/var/cache/apt/*.bin
-echo 'Apt::Changelogs::Server "http://localhost:8080/";' > rootdir/etc/apt/apt.conf.d/changelog.conf
+testsuccessequal "'http://example.org/main/f/foo/foo_1.0-changelog' foo.changelog
+'http://example.org/main/libb/libbar/libbar_1.0-changelog' libbar.changelog" aptget changelog foo libbar --print-uris -o Acquire::Changelogs::URI::Label::Debian='http://localhost:8080/CHANGEPATH.changelog'
-testequal "'http://localhost:8080/pool/apt_1.0/changelog'" aptget changelog apt --print-uris
+testsuccessequal "'http://localhost:8080/main/f/foo/foo_1.0.changelog' foo.changelog
+'http://localhost:8080/main/libb/libbar/libbar_1.0.changelog' libbar.changelog" aptget changelog foo libbar --print-uris -o Acquire::Changelogs::URI::Override::Label::Debian='http://localhost:8080/CHANGEPATH.changelog'
-testequal "'http://localhost:8080/pool/apt_1.0/changelog'
-'http://localhost:8080/pool/apt_1.0/changelog'" aptget changelog apt apt --print-uris
+releasechanger 'Changelogs' 'no'
+testequal 'E: Failed to fetch changelog:/foo.changelog Changelog unavailable for foo=1.0
+' aptget changelog foo -qq -d
+
+sed -i '/^Changelogs: / d' $(find rootdir/var/lib/apt/lists -name '*Release')
+releasechanger 'Label' 'Testcases'
+
+echo 'Acquire::Changelogs::URI::Label::Testcases "http://localhost:8080/CHANGEPATH/change.txt";' > rootdir/etc/apt/apt.conf.d/changelog.conf
+testsuccessequal "'http://localhost:8080/main/f/foo/foo_1.0/change.txt' foo.changelog
+'http://localhost:8080/main/libb/libbar/libbar_1.0/change.txt' libbar.changelog" aptget changelog foo libbar --print-uris
+
+echo 'Acquire::Changelogs::URI::Label::Testcases "http://localhost:8080/pool/CHANGEPATH/changelog";' > rootdir/etc/apt/apt.conf.d/changelog.conf
+testsuccessequal "'http://localhost:8080/pool/main/f/foo/foo_1.0/changelog' foo.changelog" aptget changelog foo --print-uris
cd downloaded
-testsuccess aptget changelog apt -qq
-testfileequal '../rootdir/tmp/testsuccess.output' "$(cat ../aptarchive/pool/apt_1.0/changelog)"
+testsuccess aptget changelog foo -qq
+testfileequal '../rootdir/tmp/testsuccess.output' "$(cat ../aptarchive/pool/main/f/foo/foo_1.0/changelog)"
+
+testsuccess aptget changelog foo libbar -qq
+testfileequal '../rootdir/tmp/testsuccess.output' "$(cat ../aptarchive/pool/main/f/foo/foo_1.0/changelog)
+$(cat ../aptarchive/pool/main/libb/libbar/libbar_1.0/changelog)"
+
+testsuccess aptget changelog foo -d
+testfilestats 'foo.changelog' '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:644"
+testfileequal 'foo.changelog' "$(cat ../aptarchive/pool/main/f/foo/foo_1.0/changelog)"
+rm -f foo.changelog
-testsuccess aptget changelog apt -d
-testfileequal 'apt.changelog' "$(cat ../aptarchive/pool/apt_1.0/changelog)"
-testfilestats 'apt.changelog' '%U:%G:%a' '=' "${USER}:${USER}:644"
-rm -f apt.changelog ../aptarchive/pool/apt_1.0/changelog
+testsuccess aptget changelog libbar foo -d
+testfilestats 'libbar.changelog' '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:644"
+testfilestats 'foo.changelog' '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:644"
+testfileequal 'libbar.changelog' "$(cat ../aptarchive/pool/main/libb/libbar/libbar_1.0/changelog)"
+testfileequal 'foo.changelog' "$(cat ../aptarchive/pool/main/f/foo/foo_1.0/changelog)"
+rm -f libbar.changelog foo.changelog
-testequal "$(cat ../aptarchive/pool/apt_1.0.changelog)" aptget changelog apt \
- -qq -o APT::Changelogs::Server='http://not-on-the-main-server:8080/'
+# as such bogus, but can happen with multiple binaries from the same source
+testsuccessequal "'http://localhost:8080/pool/main/f/foo/foo_1.0/changelog' foo.changelog
+'http://localhost:8080/pool/main/f/foo/foo_1.0/changelog' foo.changelog" aptget changelog foo foo --print-uris
+testsuccess aptget changelog foo foo -qq
+testfileequal '../rootdir/tmp/testsuccess.output' "$(cat ../aptarchive/pool/main/f/foo/foo_1.0/changelog)
+$(cat ../aptarchive/pool/main/f/foo/foo_1.0/changelog)"
+testsuccess aptget changelog foo foo -d
+testfilestats 'foo.changelog' '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:644"
+testfileequal 'foo.changelog' "$(cat ../aptarchive/pool/main/f/foo/foo_1.0/changelog)"
+rm -f foo.changelog
-testsuccess aptget changelog apt -d
-testfileequal 'apt.changelog' "$(cat ../aptarchive/pool/apt_1.0.changelog)"
-testfilestats 'apt.changelog' '%U:%G:%a' '=' "${USER}:${USER}:644"
-rm -f apt.changelog ../aptarchive/pool/apt_1.0.changelog
+# no CHANGEPATH in the URI
+testequal 'E: Failed to fetch changelog:/foo.changelog Changelog unavailable for foo=1.0
+' aptget changelog foo -qq -d -o Acquire::Changelogs::URI::Label::Testcases='http://localhost:8080/change.txt'
+testfailure test -e foo.changelog
-testequal 'E: changelog download failed' aptget changelog apt -qq -d -o APT::Changelogs::Server='http://not-on-the-main-server:8080/'
-testfailure test -e apt.changelog
+testequal 'E: Failed to fetch http://localhost:8080/does/not/exist/main/f/foo/foo_1.0/change.txt Changelog unavailable for foo=1.0 (404 Not Found)
+' aptget changelog foo -qq -d -o Acquire::Changelogs::URI::Label::Testcases='http://localhost:8080/does/not/exist/CHANGEPATH/change.txt'
+testfailure test -e foo.changelog
diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download
index 6503bbd1c..fa0b65672 100755
--- a/test/integration/test-apt-get-download
+++ b/test/integration/test-apt-get-download
@@ -38,7 +38,7 @@ testdownload() {
APT="${APT}/${3}"
fi
msgtest "Test download of package file $1 with" "$APT"
- testsuccess --nomsg aptget download ${APT}
+ testsuccess --nomsg aptget download ${APT} -o Debug::pkgAcquire::Worker=1 -o Debug::pkgAcquire::Auth=1
testsuccess test -f "$1"
rm -f "$1"
}
diff --git a/test/integration/test-apt-get-install-deb b/test/integration/test-apt-get-install-deb
index 700009da5..0f34692fe 100755
--- a/test/integration/test-apt-get-install-deb
+++ b/test/integration/test-apt-get-install-deb
@@ -8,23 +8,20 @@ setupenvironment
configarchitecture "i386"
# regression test for #754904
-testequal 'E: Unable to locate package /dev/null' aptget install -qq /dev/null
+testfailureequal 'E: Unable to locate package /dev/null' aptget install -qq /dev/null
# and ensure we fail for invalid debs
cat > foo.deb <<EOF
I'm not a deb, I'm a teapot.
EOF
-testequal 'E: Sub-process Popen returned an error code (100)
-E: Encountered a section with no Package: header
+testfailure aptget install ./foo.deb
+testsuccess grep '^E: Sub-process Popen returned an error code' rootdir/tmp/testfailure.output
+testequal 'E: Encountered a section with no Package: header
E: Problem with MergeLister for ./foo.deb
-E: The package lists or status file could not be parsed or opened.' aptget install -qq ./foo.deb
+E: The package lists or status file could not be parsed or opened.' tail -n 3 rootdir/tmp/testfailure.output
# fakeroot is currently not found, framwork needs updating
-#
-#buildsimplenativepackage 'foo' 'all' '1.0'
-#
-#testequal 'Selecting previously unselected package foo.
-#(Reading database ... 0 files and directories currently installed.)
-# Preparing to unpack .../incoming/foo_1.0_all.deb ...
-#Unpacking foo (1.0) ...
-#Setting up foo (1.0) ...' aptget install -qq ./incoming/foo_1.0_all.deb
+buildsimplenativepackage 'foo' 'all' '1.0'
+testdpkgnotinstalled 'foo'
+testsuccess aptget install ./incoming/foo_1.0_all.deb
+testdpkginstalled 'foo'
diff --git a/test/integration/test-apt-get-source b/test/integration/test-apt-get-source
index b27cbbe96..22f01b997 100755
--- a/test/integration/test-apt-get-source
+++ b/test/integration/test-apt-get-source
@@ -34,55 +34,53 @@ APTARCHIVE=$(readlink -f ./aptarchive)
# normal operation gets highest version number
HEADER="Reading package lists...
Building dependency tree..."
-testequal "$HEADER
-Need to get 0 B of source archives.
-'file://${APTARCHIVE}/foo_2.0.dsc' foo_2.0.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
-'file://${APTARCHIVE}/foo_2.0.tar.gz' foo_2.0.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -q --print-uris foo
+DOWNLOAD1="Need to get 0 B/25 B of source archives.
+'file://${APTARCHIVE}/foo_1.0.dsc' foo_1.0.dsc 11 MD5Sum:b998e085e36cf162e6a33c2801318fef
+'file://${APTARCHIVE}/foo_1.0.tar.gz' foo_1.0.tar.gz 14 MD5Sum:d46b9a02af8487cbeb49165540c88184"
+DOWNLOAD2="Need to get 0 B/25 B of source archives.
+'file://${APTARCHIVE}/foo_2.0.dsc' foo_2.0.dsc 11 MD5Sum:c0de572c6f8aa576c8ff78c81132ed55
+'file://${APTARCHIVE}/foo_2.0.tar.gz' foo_2.0.tar.gz 14 MD5Sum:e10bb487c375b2b938d27bd31c2d1f5f"
+testsuccessequal "$HEADER
+$DOWNLOAD2" aptget source -q --print-uris foo
# select by release: suite
-testequal "$HEADER
+testsuccessequal "$HEADER
Selected version '1.0' (stable) for foo
-Need to get 0 B of source archives.
-'file://${APTARCHIVE}/foo_1.0.dsc' foo_1.0.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
-'file://${APTARCHIVE}/foo_1.0.tar.gz' foo_1.0.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -q --print-uris foo/stable
-testequal "$HEADER
+$DOWNLOAD1" aptget source -q --print-uris foo/stable
+testsuccessequal "$HEADER
Selected version '2.0' (unstable) for foo
-Need to get 0 B of source archives.
-'file://${APTARCHIVE}/foo_2.0.dsc' foo_2.0.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
-'file://${APTARCHIVE}/foo_2.0.tar.gz' foo_2.0.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -q --print-uris foo/unstable
+$DOWNLOAD2" aptget source -q --print-uris foo/unstable
# select by release: codename
-testequal "$HEADER
+testsuccessequal "$HEADER
Selected version '2.0' (sid) for foo
-Need to get 0 B of source archives.
-'file://${APTARCHIVE}/foo_2.0.dsc' foo_2.0.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
-'file://${APTARCHIVE}/foo_2.0.tar.gz' foo_2.0.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -q --print-uris foo/sid
+$DOWNLOAD2" aptget source -q --print-uris foo/sid
# select by version
-testequal "$HEADER
-Need to get 0 B of source archives.
-'file://${APTARCHIVE}/foo_1.0.dsc' foo_1.0.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
-'file://${APTARCHIVE}/foo_1.0.tar.gz' foo_1.0.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -q --print-uris foo=1.0
+testsuccessequal "$HEADER
+$DOWNLOAD1" aptget source -q --print-uris foo=1.0
# select by release with no binary package (Bug#731102) but ensure to get
# highest version
-testequal "$HEADER
+DOWNLOAD01="Need to get 0 B/25 B of source archives.
+'file://${APTARCHIVE}/foo_0.1.dsc' foo_0.1.dsc 11 MD5Sum:0811a4d85238056c613ea897f49f01af
+'file://${APTARCHIVE}/foo_0.1.tar.gz' foo_0.1.tar.gz 14 MD5Sum:fa1ecb7a1a53e8e6f6551ca7db888a61"
+testsuccessequal "$HEADER
Selected version '0.1' (wheezy) for foo
-Need to get 0 B of source archives.
-'file://${APTARCHIVE}/foo_0.1.dsc' foo_0.1.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
-'file://${APTARCHIVE}/foo_0.1.tar.gz' foo_0.1.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -q --print-uris foo/wheezy
+$DOWNLOAD01" aptget source -q --print-uris foo/wheezy
# unavailable one
-testequal "$HEADER
+testfailureequal "$HEADER
E: Can not find version '9.9-not-there' of package 'foo'
E: Unable to find a source package for foo" aptget source -q --print-uris foo=9.9-not-there
# version and release
-testequal "$HEADER
-Need to get 0 B of source archives.
-'file://${APTARCHIVE}/foo_0.0.1.dsc' foo_0.0.1.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
-'file://${APTARCHIVE}/foo_0.0.1.tar.gz' foo_0.0.1.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -q --print-uris -t unstable foo=0.0.1
-
-testequal "$HEADER
-Need to get 0 B of source archives.
+DOWNLOAD001="Need to get 0 B/29 B of source archives.
+'file://${APTARCHIVE}/foo_0.0.1.dsc' foo_0.0.1.dsc 13 MD5Sum:6c819ebf0a21b1a480e1dbf6b8edfebd
+'file://${APTARCHIVE}/foo_0.0.1.tar.gz' foo_0.0.1.tar.gz 16 MD5Sum:a3c7e1ac2159fc0faf522e110d6906fd"
+testsuccessequal "$HEADER
+$DOWNLOAD001" aptget source -q --print-uris -t unstable foo=0.0.1
+
+testsuccessequal "$HEADER
+Need to get 0 B/25 B of source archives.
Fetch source foo" aptget source -q -s foo
diff --git a/test/integration/test-apt-get-source-arch b/test/integration/test-apt-get-source-arch
index d7ed56dc9..f54bb6012 100755
--- a/test/integration/test-apt-get-source-arch
+++ b/test/integration/test-apt-get-source-arch
@@ -28,43 +28,42 @@ APTARCHIVE=$(readlink -f ./aptarchive)
HEADER="Reading package lists...
Building dependency tree..."
+DOWNLOAD10="Need to get 0 B/25 B of source archives.
+'file://${APTARCHIVE}/foo_1.0.dsc' foo_1.0.dsc 11 MD5Sum:b998e085e36cf162e6a33c2801318fef
+'file://${APTARCHIVE}/foo_1.0.tar.gz' foo_1.0.tar.gz 14 MD5Sum:d46b9a02af8487cbeb49165540c88184"
# pick :amd64
-testequal "$HEADER
-Need to get 0 B of source archives.
-'file://${APTARCHIVE}/foo_1.0.dsc' foo_1.0.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
-'file://${APTARCHIVE}/foo_1.0.tar.gz' foo_1.0.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -q --print-uris foo:amd64
+testsuccessequal "$HEADER
+$DOWNLOAD10" aptget source -q --print-uris foo:amd64
# pick :i386
-testequal "$HEADER
-Need to get 0 B of source archives.
-'file://${APTARCHIVE}/foo_2.0.dsc' foo_2.0.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
-'file://${APTARCHIVE}/foo_2.0.tar.gz' foo_2.0.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -q --print-uris foo:i386
+testsuccessequal "$HEADER
+Need to get 0 B/25 B of source archives.
+'file://${APTARCHIVE}/foo_2.0.dsc' foo_2.0.dsc 11 MD5Sum:c0de572c6f8aa576c8ff78c81132ed55
+'file://${APTARCHIVE}/foo_2.0.tar.gz' foo_2.0.tar.gz 14 MD5Sum:e10bb487c375b2b938d27bd31c2d1f5f" aptget source -q --print-uris foo:i386
# pick :i386 by release
-testequal "$HEADER
+testsuccessequal "$HEADER
Selected version '0.1' (oldstable) for foo
-Need to get 0 B of source archives.
-'file://${APTARCHIVE}/foo_0.1.dsc' foo_0.1.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
-'file://${APTARCHIVE}/foo_0.1.tar.gz' foo_0.1.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -q --print-uris foo:i386/oldstable
+Need to get 0 B/25 B of source archives.
+'file://${APTARCHIVE}/foo_0.1.dsc' foo_0.1.dsc 11 MD5Sum:0811a4d85238056c613ea897f49f01af
+'file://${APTARCHIVE}/foo_0.1.tar.gz' foo_0.1.tar.gz 14 MD5Sum:fa1ecb7a1a53e8e6f6551ca7db888a61" aptget source -q --print-uris foo:i386/oldstable
# pick :i386 by version
-testequal "$HEADER
-Need to get 0 B of source archives.
-'file://${APTARCHIVE}/foo_1.0.dsc' foo_1.0.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
-'file://${APTARCHIVE}/foo_1.0.tar.gz' foo_1.0.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -q --print-uris foo:i386=1.0
+testsuccessequal "$HEADER
+$DOWNLOAD10" aptget source -q --print-uris foo:i386=1.0
# error on unknown arch
-testequal "$HEADER
+testfailureequal "$HEADER
E: Can not find a package for architecture 'not-a-available-arch'
E: Unable to find a source package for foo:not-a-available-arch" aptget source -q --print-uris foo:not-a-available-arch
# error on unavailable version for arch
-testequal "$HEADER
+testfailureequal "$HEADER
E: Can not find a package 'foo:amd64' with version '2.0'
E: Unable to find a source package for foo:amd64=2.0" aptget source -q --print-uris foo:amd64=2.0
-# error on unavailable release for arch
-testequal "$HEADER
+# error on unavailable release for arch
+testfailureequal "$HEADER
E: Can not find a package 'foo:amd64' with release 'oldstable'
E: Unable to find a source package for foo:amd64/oldstable" aptget source -q --print-uris foo:amd64/oldstable
diff --git a/test/integration/test-apt-get-source-authenticated b/test/integration/test-apt-get-source-authenticated
index f68c32386..da63f7cb3 100755
--- a/test/integration/test-apt-get-source-authenticated
+++ b/test/integration/test-apt-get-source-authenticated
@@ -1,7 +1,7 @@
#!/bin/sh
#
# Regression test for debian bug #749795. Ensure that we fail with
-# a error if apt-get source foo will download a source that comes
+# an error if apt-get source foo will download a source that comes
# from a unauthenticated repository
#
set -e
@@ -31,4 +31,3 @@ testfailure test -e foo_2.0.dsc
# allow overriding the warning
testsuccess aptget source --allow-unauthenticated foo -o Debug::pkgAcquire::Worker=1
testsuccess test -s foo_2.0.dsc -a -L foo_2.0.dsc
-testaccessrights 'foo_2.0.dsc' '777'
diff --git a/test/integration/test-apt-get-source-multisources b/test/integration/test-apt-get-source-multisources
index cc759e8c1..887a30685 100755
--- a/test/integration/test-apt-get-source-multisources
+++ b/test/integration/test-apt-get-source-multisources
@@ -19,12 +19,12 @@ APTARCHIVE=$(readlink -f ./aptarchive)
HEADER="Reading package lists...
Building dependency tree..."
-testequal "$HEADER
-Need to get 0 B of source archives.
-'file://${APTARCHIVE}/adduser_3.113+nmu3.dsc' adduser_3.113+nmu3.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
-'file://${APTARCHIVE}/python-fll_0.9.11.dsc' python-fll_0.9.11.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -qdy --print-uris --dsc-only adduser=3.113 python-fll=0.9.11
-
-testequal "$HEADER
-Need to get 0 B of source archives.
-'file://${APTARCHIVE}/python-fll_0.9.11.dsc' python-fll_0.9.11.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
-'file://${APTARCHIVE}/adduser_3.113+nmu3.dsc' adduser_3.113+nmu3.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source -qdy --print-uris --dsc-only python-fll=0.9.11 adduser=3.113
+testsuccessequal "$HEADER
+Need to get 0 B/43 B of source archives.
+'file://${APTARCHIVE}/adduser_3.113+nmu3.dsc' adduser_3.113+nmu3.dsc 22 MD5Sum:255405ab5af211238ef53b7a1dd8ca4b
+'file://${APTARCHIVE}/python-fll_0.9.11.dsc' python-fll_0.9.11.dsc 21 MD5Sum:740a9dbf02a295932f15b1415d0dc0df" aptget source -qdy --print-uris --dsc-only adduser=3.113 python-fll=0.9.11
+
+testsuccessequal "$HEADER
+Need to get 0 B/43 B of source archives.
+'file://${APTARCHIVE}/python-fll_0.9.11.dsc' python-fll_0.9.11.dsc 21 MD5Sum:740a9dbf02a295932f15b1415d0dc0df
+'file://${APTARCHIVE}/adduser_3.113+nmu3.dsc' adduser_3.113+nmu3.dsc 22 MD5Sum:255405ab5af211238ef53b7a1dd8ca4b" aptget source -qdy --print-uris --dsc-only python-fll=0.9.11 adduser=3.113
diff --git a/test/integration/test-apt-get-update-unauth-warning b/test/integration/test-apt-get-update-unauth-warning
index 0389415c1..fcabf244a 100755
--- a/test/integration/test-apt-get-update-unauth-warning
+++ b/test/integration/test-apt-get-update-unauth-warning
@@ -9,6 +9,7 @@ TESTDIR=$(readlink -f $(dirname $0))
setupenvironment
configarchitecture "i386"
+configcompression '.' 'gz'
# a "normal" package with source and binary
buildsimplenativepackage 'foo' 'all' '2.0'
@@ -19,25 +20,65 @@ APTARCHIVE=$(readlink -f ./aptarchive)
rm -f $APTARCHIVE/dists/unstable/*Release*
# update without authenticated files leads to warning
-testequal "Ign file: unstable InRelease
+testfailureequal "Get:1 file:$APTARCHIVE unstable InRelease
+Ign:1 file:$APTARCHIVE unstable InRelease
File not found
-Err file: unstable Release
+Get:2 file:$APTARCHIVE unstable Release
+Err:2 file:$APTARCHIVE unstable Release
File not found
-W: The repository 'file: unstable Release' does not have a Release file. This is deprecated, please contact the owner of the repository.
+W: The repository 'file:$APTARCHIVE unstable Release' does not have a Release file. This is deprecated, please contact the owner of the repository.
E: Use --allow-insecure-repositories to force the update" aptget update --no-allow-insecure-repositories
# no package foo
-testequal "Listing..." apt list foo
-testequal "partial" ls rootdir/var/lib/apt/lists
+testsuccessequal 'Listing...' apt list foo
+testequal 'lock
+partial' ls rootdir/var/lib/apt/lists
+filesize() {
+ stat -c%s "$(aptget files --no-release-info --format '$(URI)' "Created-By: $1" | cut -d'/' -f 3- ).gz"
+}
# allow override
-testequal "Ign file: unstable InRelease
+#aptget update --allow-insecure-repositories -o Debug::pkgAcquire::worker=1
+#exit
+testwarningequal "Get:1 file:$APTARCHIVE unstable InRelease
+Ign:1 file:$APTARCHIVE unstable InRelease
File not found
-Ign file: unstable Release
+Get:2 file:$APTARCHIVE unstable Release
+Ign:2 file:$APTARCHIVE unstable Release
File not found
+Get:3 file:$APTARCHIVE unstable/main Sources
+Ign:3 file:$APTARCHIVE unstable/main Sources
+ File not found
+Get:4 file:$APTARCHIVE unstable/main i386 Packages
+Ign:4 file:$APTARCHIVE unstable/main i386 Packages
+ File not found
+Get:5 file:$APTARCHIVE unstable/main Translation-en
+Ign:5 file:$APTARCHIVE unstable/main Translation-en
+ File not found
+Get:3 file:$APTARCHIVE unstable/main Sources
+Ign:3 file:$APTARCHIVE unstable/main Sources
+ File not found
+Get:4 file:$APTARCHIVE unstable/main i386 Packages
+Ign:4 file:$APTARCHIVE unstable/main i386 Packages
+ File not found
+Get:5 file:$APTARCHIVE unstable/main Translation-en
+Ign:5 file:$APTARCHIVE unstable/main Translation-en
+ File not found
+Get:3 file:$APTARCHIVE unstable/main Sources
+Ign:3 file:$APTARCHIVE unstable/main Sources
+ File not found
+Get:4 file:$APTARCHIVE unstable/main i386 Packages
+Ign:4 file:$APTARCHIVE unstable/main i386 Packages
+ File not found
+Get:5 file:$APTARCHIVE unstable/main Translation-en
+Ign:5 file:$APTARCHIVE unstable/main Translation-en
+ File not found
+Get:3 file:$APTARCHIVE unstable/main Sources [$(filesize 'Sources') B]
+Get:4 file:$APTARCHIVE unstable/main i386 Packages [$(filesize 'Packages') B]
+Get:5 file:$APTARCHIVE unstable/main Translation-en [$(filesize 'Translations') B]
Reading package lists...
-W: The repository 'file: unstable Release' does not have a Release file. This is deprecated, please contact the owner of the repository." aptget update --allow-insecure-repositories
+W: The repository 'file:$APTARCHIVE unstable Release' does not have a Release file. This is deprecated, please contact the owner of the repository." aptget update --allow-insecure-repositories
# ensure we can not install the package
-testequal "WARNING: The following packages cannot be authenticated!
+testfailureequal "WARNING: The following packages cannot be authenticated!
foo
E: There are problems and -y was used without --force-yes" aptget install -qq -y foo
diff --git a/test/integration/test-apt-get-upgrade b/test/integration/test-apt-get-upgrade
index d042e4fb7..09cbcdb7e 100755
--- a/test/integration/test-apt-get-upgrade
+++ b/test/integration/test-apt-get-upgrade
@@ -21,56 +21,124 @@ insertpackage 'stable,installed' 'upgrade-with-conflict' 'all' '1.0'
insertpackage 'unstable' 'upgrade-with-conflict' 'all' '2.0' 'Conflicts: conflicting-dep' 'standard'
insertpackage 'stable,installed' 'conflicting-dep' 'all' '1.0'
+# upgrade with conflict and a new pkg with higher priority than conflict
+insertpackage 'stable,installed' 'init' 'all' '1'
+insertpackage 'unstable' 'init' 'all' '2' 'Pre-Depends: systemd | sysvinit'
+insertpackage 'unstable' 'systemd' 'all' '2' 'Conflicts: conflicting-dep'
+insertpackage 'unstable' 'sysvinit' 'all' '2'
+
setupaptarchive
# Test if normal upgrade works as expected
-testequal 'Reading package lists...
+UPGRADE='Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages have been kept back:
- upgrade-with-conflict upgrade-with-new-dep
+ init upgrade-with-conflict upgrade-with-new-dep
The following packages will be upgraded:
upgrade-simple
-1 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.
+1 upgraded, 0 newly installed, 0 to remove and 3 not upgraded.
Inst upgrade-simple [1.0] (2.0 unstable [all])
-Conf upgrade-simple (2.0 unstable [all])' aptget -s upgrade
+Conf upgrade-simple (2.0 unstable [all])'
+testsuccessequal "$UPGRADE" aptget upgrade -s
+testsuccessequal "$UPGRADE" apt upgrade -s --without-new-pkgs
# Test if apt-get upgrade --with-new-pkgs works
-testequal 'Reading package lists...
+UPGRADENEW='Reading package lists...
Building dependency tree...
Calculating upgrade...
The following NEW packages will be installed:
new-dep
The following packages have been kept back:
- upgrade-with-conflict
+ init upgrade-with-conflict
The following packages will be upgraded:
upgrade-simple upgrade-with-new-dep
-2 upgraded, 1 newly installed, 0 to remove and 1 not upgraded.
+2 upgraded, 1 newly installed, 0 to remove and 2 not upgraded.
Inst new-dep (1.0 stable [all])
Inst upgrade-simple [1.0] (2.0 unstable [all])
Inst upgrade-with-new-dep [1.0] (2.0 unstable [all])
Conf new-dep (1.0 stable [all])
Conf upgrade-simple (2.0 unstable [all])
-Conf upgrade-with-new-dep (2.0 unstable [all])' aptget -s upgrade --with-new-pkgs
+Conf upgrade-with-new-dep (2.0 unstable [all])'
+testsuccessequal "$UPGRADENEW" aptget upgrade -s --with-new-pkgs
+testsuccessequal "$UPGRADENEW" apt upgrade -s
# Test if apt-get dist-upgrade works
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
conflicting-dep
The following NEW packages will be installed:
- new-dep
+ new-dep systemd
The following packages will be upgraded:
- upgrade-simple upgrade-with-conflict upgrade-with-new-dep
-3 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
+ init upgrade-simple upgrade-with-conflict upgrade-with-new-dep
+4 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
Remv conflicting-dep [1.0]
+Inst systemd (2 unstable [all])
+Conf systemd (2 unstable [all])
+Inst init [1] (2 unstable [all])
Inst upgrade-with-conflict [1.0] (2.0 unstable [all])
Inst new-dep (1.0 stable [all])
Inst upgrade-simple [1.0] (2.0 unstable [all])
Inst upgrade-with-new-dep [1.0] (2.0 unstable [all])
+Conf init (2 unstable [all])
Conf upgrade-with-conflict (2.0 unstable [all])
Conf new-dep (1.0 stable [all])
Conf upgrade-simple (2.0 unstable [all])
Conf upgrade-with-new-dep (2.0 unstable [all])' aptget -s dist-upgrade
+msgmsg 'make systemd a non-choice in the or-group and try again'
+echo 'Package: systemd
+Pin: release unstable
+Pin-Priority: -1' > rootdir/etc/apt/preferences.d/nosystemd.pref
+
+testsuccessequal "$UPGRADE" aptget upgrade -s
+testsuccessequal "$UPGRADE" apt upgrade -s --without-new-pkgs
+
+UPGRADENEW='Reading package lists...
+Building dependency tree...
+Calculating upgrade...
+The following NEW packages will be installed:
+ new-dep sysvinit
+The following packages have been kept back:
+ upgrade-with-conflict
+The following packages will be upgraded:
+ init upgrade-simple upgrade-with-new-dep
+3 upgraded, 2 newly installed, 0 to remove and 1 not upgraded.
+Inst sysvinit (2 unstable [all])
+Conf sysvinit (2 unstable [all])
+Inst init [1] (2 unstable [all])
+Inst new-dep (1.0 stable [all])
+Inst upgrade-simple [1.0] (2.0 unstable [all])
+Inst upgrade-with-new-dep [1.0] (2.0 unstable [all])
+Conf init (2 unstable [all])
+Conf new-dep (1.0 stable [all])
+Conf upgrade-simple (2.0 unstable [all])
+Conf upgrade-with-new-dep (2.0 unstable [all])'
+testsuccessequal "$UPGRADENEW" aptget upgrade -s --with-new-pkgs
+testsuccessequal "$UPGRADENEW" apt upgrade -s
+
+testsuccessequal 'Reading package lists...
+Building dependency tree...
+Calculating upgrade...
+The following packages will be REMOVED:
+ conflicting-dep
+The following NEW packages will be installed:
+ new-dep sysvinit
+The following packages will be upgraded:
+ init upgrade-simple upgrade-with-conflict upgrade-with-new-dep
+4 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
+Remv conflicting-dep [1.0]
+Inst sysvinit (2 unstable [all])
+Conf sysvinit (2 unstable [all])
+Inst init [1] (2 unstable [all])
+Inst upgrade-with-conflict [1.0] (2.0 unstable [all])
+Inst new-dep (1.0 stable [all])
+Inst upgrade-simple [1.0] (2.0 unstable [all])
+Inst upgrade-with-new-dep [1.0] (2.0 unstable [all])
+Conf init (2 unstable [all])
+Conf upgrade-with-conflict (2.0 unstable [all])
+Conf new-dep (1.0 stable [all])
+Conf upgrade-simple (2.0 unstable [all])
+Conf upgrade-with-new-dep (2.0 unstable [all])' aptget -s dist-upgrade
diff --git a/test/integration/test-apt-helper b/test/integration/test-apt-helper
index 06e497ff7..00d859ad5 100755
--- a/test/integration/test-apt-helper
+++ b/test/integration/test-apt-helper
@@ -11,39 +11,40 @@ changetohttpswebserver
test_apt_helper_download() {
echo 'foo' > aptarchive/foo
+ echo 'bar' > aptarchive/foo2
- msgtest 'apt-file download-file' 'md5sum'
- apthelper -qq download-file http://localhost:8080/foo downloaded/foo2 MD5Sum:d3b07384d113edec49eaa6238ad5ff00 && msgpass || msgfail
- testfileequal downloaded/foo2 'foo'
+ msgtest 'apt-file download-file md5sum'
+ testsuccess --nomsg apthelper download-file http://localhost:8080/foo ./downloaded/foo2 MD5Sum:d3b07384d113edec49eaa6238ad5ff00
+ testfileequal ./downloaded/foo2 'foo'
- msgtest 'apt-file download-file' 'sha1'
- apthelper -qq download-file http://localhost:8080/foo downloaded/foo1 SHA1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 && msgpass || msgfail
- testfileequal downloaded/foo1 'foo'
+ msgtest 'apt-file download-file sha1'
+ testsuccess --nomsg apthelper download-file http://localhost:8080/foo ./downloaded/foo1 SHA1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
+ testfileequal ./downloaded/foo1 'foo'
- msgtest 'apt-file download-file' 'sha256'
- apthelper -qq download-file http://localhost:8080/foo downloaded/foo3 SHA256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c && msgpass || msgfail
- testfileequal downloaded/foo3 'foo'
+ msgtest 'apt-file download-file sha256'
+ testsuccess --nomsg apthelper download-file http://localhost:8080/foo ./downloaded/foo3 SHA256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c
+ testfileequal ./downloaded/foo3 'foo'
- msgtest 'apt-file download-file' 'no-hash'
- apthelper -qq download-file http://localhost:8080/foo downloaded/foo4 && msgpass || msgfail
- testfileequal downloaded/foo4 'foo'
+ msgtest 'apt-file download-file no-hash'
+ testsuccess --nomsg apthelper download-file http://localhost:8080/foo ./downloaded/foo4
+ testfileequal ./downloaded/foo4 'foo'
- msgtest 'apt-file download-file' 'wrong hash'
- if ! apthelper -qq download-file http://localhost:8080/foo downloaded/foo5 MD5Sum:aabbcc 2>&1 2> download.stderr; then
- msgpass
- else
- msgfail
- fi
- testfileequal download.stderr 'E: Failed to fetch http://localhost:8080/foo Hash Sum mismatch
+ msgtest 'apt-file download-file wrong hash'
+ testfailure --nomsg apthelper -qq download-file http://localhost:8080/foo ./downloaded/foo5 MD5Sum:aabbcc
+ testfileequal rootdir/tmp/testfailure.output 'E: Failed to fetch http://localhost:8080/foo Hash Sum mismatch
E: Download Failed'
- testfileequal downloaded/foo5.FAILED 'foo'
- testfailure test -e downloaded/foo5
+ testfileequal ./downloaded/foo5.FAILED 'foo'
+
+ msgtest 'apt-file download-file md5sum sha1'
+ testsuccess --nomsg apthelper download-file http://localhost:8080/foo ./downloaded/foo6 MD5Sum:d3b07384d113edec49eaa6238ad5ff00 http://localhost:8080/foo2 ./downloaded/foo7 SHA1:e242ed3bffccdf271b7fbaf34ed72d089537b42f
+ testfileequal ./downloaded/foo6 'foo'
+ testfileequal ./downloaded/foo7 'bar'
}
test_apt_helper_detect_proxy() {
# no proxy
- testequal "Using proxy '' for URL 'http://example.com/'" apthelper auto-detect-proxy http://example.com/
+ testsuccessequal "Using proxy '' for URL 'http://example.com/'" apthelper auto-detect-proxy http://example.com/
# http auto detect proxy script
@@ -53,8 +54,8 @@ echo "http://some-proxy"
EOF
chmod 755 apt-proxy-detect
echo "Acquire::http::Proxy-Auto-Detect \"$(pwd)/apt-proxy-detect\";" > rootdir/etc/apt/apt.conf.d/02proxy-detect
-
- testequal "Using proxy 'http://some-proxy' for URL 'http://www.example.com/'" apthelper auto-detect-proxy http://www.example.com
+
+ testsuccessequal "Using proxy 'http://some-proxy' for URL 'http://www.example.com/'" apthelper auto-detect-proxy http://www.example.com
# https auto detect proxy script
@@ -64,13 +65,15 @@ echo "https://https-proxy"
EOF
chmod 755 apt-proxy-detect
echo "Acquire::https::Proxy-Auto-Detect \"$(pwd)/apt-proxy-detect\";" > rootdir/etc/apt/apt.conf.d/02proxy-detect
-
- testequal "Using proxy 'https://https-proxy' for URL 'https://ssl.example.com/'" apthelper auto-detect-proxy https://ssl.example.com
-
-
+ testsuccessequal "Using proxy 'https://https-proxy' for URL 'https://ssl.example.com/'" apthelper auto-detect-proxy https://ssl.example.com
}
test_apt_helper_download
test_apt_helper_detect_proxy
+# test failure modes
+testfailureequal 'E: Invalid operation download' apthelper download
+testfailureequal 'E: Must specify at least one pair url/filename' apthelper download-file
+testfailureequal 'E: Must specify at least one pair url/filename' apthelper download-file http://example.org/
+testfailureequal 'E: Need one URL as argument' apthelper auto-detect-proxy
diff --git a/test/integration/test-apt-https-no-redirect b/test/integration/test-apt-https-no-redirect
index bc744d6f2..c91c78916 100755
--- a/test/integration/test-apt-https-no-redirect
+++ b/test/integration/test-apt-https-no-redirect
@@ -14,22 +14,15 @@ echo 'alright' > aptarchive/working
changetohttpswebserver -o 'aptwebserver::redirect::replace::/redirectme/=http://localhost:8080/'
msgtest 'download of a file works via' 'http'
-downloadfile 'http://localhost:8080/working' httpfile >/dev/null 2>&1 && msgpass || msgfail
+testsuccess --nomsg downloadfile 'http://localhost:8080/working' httpfile
testfileequal httpfile 'alright'
msgtest 'download of a file works via' 'https'
-downloadfile 'https://localhost:4433/working' httpsfile >/dev/null 2>&1 && msgpass || msgfail
+testsuccess --nomsg downloadfile 'https://localhost:4433/working' httpsfile
testfileequal httpsfile 'alright'
msgtest 'download of a file does not work if' 'https redirected to http'
-downloadfile 'https://localhost:4433/redirectme/working' redirectfile >curloutput 2>&1 && msgfail || msgpass
+testfailure --nomsg downloadfile 'https://localhost:4433/redirectme/working' redirectfile
msgtest 'libcurl has forbidden access in last request to' 'http resource'
-if grep -q -E -- 'Protocol "?http"? not supported or disabled in libcurl' curloutput; then
- msgpass
-else
- cat curloutput
- msgfail
-fi
-
-
+testsuccess --nomsg grep -q -E -- 'Protocol "?http"? not supported or disabled in libcurl' rootdir/tmp/testfailure.output
diff --git a/test/integration/test-apt-key b/test/integration/test-apt-key
index b6b7b7909..486acccc8 100755
--- a/test/integration/test-apt-key
+++ b/test/integration/test-apt-key
@@ -17,7 +17,7 @@ testaptkeys() {
if ! aptkey list | grep '^pub' > aptkey.list; then
echo -n > aptkey.list
fi
- testequal "$1" cat ./aptkey.list
+ testfileequal './aptkey.list' "$1"
}
echo 'APT::Key::ArchiveKeyring "./keys/joesixpack.pub";
@@ -35,7 +35,7 @@ testrun() {
testaptkeys 'pub 2048R/DBAC8DAE 2010-08-18'
- testequal 'gpg: key DBAC8DAE: "Joe Sixpack (APT Testcases Dummy) <joe@example.org>" not changed
+ testsuccessequal 'gpg: key DBAC8DAE: "Joe Sixpack (APT Testcases Dummy) <joe@example.org>" not changed
gpg: Total number processed: 1
gpg: unchanged: 1' aptkey --fakeroot update
@@ -73,6 +73,12 @@ pub 2048R/DBAC8DAE 2010-08-18'
testsuccess aptkey --fakeroot del DBAC8DAE
testempty aptkey list
+ msgtest 'Test key removal with' 'lowercase key ID' #keylength somewher between 8byte and short
+ cleanplate
+ cp -a keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
+ testsuccess --nomsg aptkey --fakeroot del d141dbac8dae
+ testempty aptkey list
+
msgtest 'Test key removal with' 'single key in real file'
cleanplate
cp -a keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
@@ -181,3 +187,4 @@ setupgpgcommand 'gpg'
testrun
setupgpgcommand 'gpg2'
testrun
+
diff --git a/test/integration/test-apt-key-net-update b/test/integration/test-apt-key-net-update
index b3c118555..2a0823bec 100755
--- a/test/integration/test-apt-key-net-update
+++ b/test/integration/test-apt-key-net-update
@@ -23,7 +23,7 @@ echo 'APT::Key::ArchiveKeyringURI "http://localhost:8080/ubuntu/project/test-arc
echo 'APT::Key::Net-Update-Enabled "1";' >> ./aptconfig.conf
# test against the "real" webserver
-testequal 'Checking for new archive signing keys now
+testsuccessequal 'Checking for new archive signing keys now
gpg: key F68C85A3: public key "Test Automatic Archive Signing Key <ftpmaster@example.com>" imported
gpg: Total number processed: 1
gpg: imported: 1 (RSA: 1)' aptkey --fakeroot net-update
@@ -40,7 +40,7 @@ echo 'APT::Key::ArchiveKeyringURI "http://localhost:8080/ubuntu/project/marvinpa
echo 'APT::Key::Net-Update-Enabled "1";' >> ./aptconfig.conf
# test against the "real" webserver
-testequal "Checking for new archive signing keys now
+testsuccessequal "Checking for new archive signing keys now
Key 'DE66AECA9151AFA1877EC31DE8525D47528144E2' not added. It is not signed with a master key" aptkey --fakeroot net-update
aptkey list | grep '^pub' > aptkey.list
diff --git a/test/integration/test-apt-mark b/test/integration/test-apt-mark
new file mode 100755
index 000000000..9b68945f9
--- /dev/null
+++ b/test/integration/test-apt-mark
@@ -0,0 +1,101 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64' 'i386'
+
+insertpackage 'unstable' 'bar' 'amd64,i386' '1'
+insertpackage 'unstable' 'uninstalled' 'all' '1'
+insertpackage 'unstable' 'uninstalled-native' 'amd64' '1'
+
+insertinstalledpackage 'foo' 'all' '1'
+insertinstalledpackage 'bar' 'amd64' '1'
+
+setupaptarchive
+
+# dpkg is "installed" by our test framework
+testdpkginstalled dpkg
+
+testnoautopkg() {
+ testempty aptmark showauto
+ testempty aptcache showauto
+ testsuccessequal 'bar
+dpkg
+foo' aptmark showmanual
+ testsuccessequal 'bar
+foo' aptmark showmanual bar foo uninstalled
+}
+testfooisauto() {
+ testsuccessequal 'foo' aptmark showauto
+ testsuccessequal 'foo' aptcache showauto
+ testsuccessequal 'foo' aptmark showauto foo
+ testsuccessequal 'foo' aptcache showauto foo
+ testsuccessequal 'bar
+dpkg' aptmark showmanual
+ testsuccessequal 'bar' aptmark showmanual bar
+}
+testmarkonpkgasauto() {
+ testsuccess $1 $2 foo
+ testfooisauto
+ testsuccess $1 $2 foo
+ testfooisauto
+
+ testsuccess $1 $3 foo
+ testnoautopkg
+ testsuccess $1 $3 foo
+ testnoautopkg
+}
+
+testfailureequal 'E: No packages found' aptmark auto
+testfailureequal 'E: No packages found' aptmark manual
+
+testnoautopkg
+testmarkonpkgasauto 'aptmark' 'auto' 'manual'
+testmarkonpkgasauto 'aptmark' 'markauto' 'unmarkauto'
+testmarkonpkgasauto 'aptget' 'markauto' 'unmarkauto'
+
+testnoholdpkg() {
+ testempty aptmark showhold
+ testempty aptmark showholds # typical "typo"
+ testempty aptmark showhold dpkg
+ testempty aptmark showholds dpkg
+}
+testpkgonhold() {
+ testsuccessequal "$1" aptmark showhold
+ testsuccessequal "$1" aptmark showholds
+ testsuccessequal "$1" aptmark showhold $1
+ testsuccessequal "$1" aptmark showholds $1
+}
+testmarkonepkgashold() {
+ testsuccess aptmark hold $1
+ testpkgonhold $1
+ testsuccess aptmark hold $1
+ testpkgonhold $1
+ testsuccess aptmark unhold $1
+ testnoholdpkg
+ testsuccess aptmark unhold $1
+ testnoholdpkg
+}
+
+testfailureequal 'E: No packages found' aptmark hold
+testfailureequal 'E: No packages found' aptmark unhold
+
+testnoholdpkg
+testmarkonepkgashold 'foo'
+testmarkonepkgashold 'bar'
+
+msgtest 'dpkg supports --merge-avail via' 'stdin'
+if dpkg --merge-avail - < /dev/null >/dev/null 2>&1; then
+ msgpass
+else
+ msgskip 'dpkg version too old'
+ exit 0
+fi
+
+testmarkonepkgashold 'uninstalled'
+testmarkonepkgashold 'uninstalled-native'
+
+testsuccessequal 'uninstalled set on hold.' aptmark hold uninstalled
+testsuccessequal 'uninstalled-native set on hold.' aptmark hold uninstalled-native
diff --git a/test/integration/test-apt-progress-fd b/test/integration/test-apt-progress-fd
index af022f582..e30d503cb 100755
--- a/test/integration/test-apt-progress-fd
+++ b/test/integration/test-apt-progress-fd
@@ -15,72 +15,75 @@ setupaptarchive
# install native
exec 3> apt-progress.log
testsuccess aptget install testing=0.1 -y -o APT::Status-Fd=3
-testequal "dlstatus:1:0:Retrieving file 1 of 1
+testfileequal './apt-progress.log' 'dlstatus:1:0:Retrieving file 1 of 1
dlstatus:1:20:Retrieving file 1 of 1
pmstatus:dpkg-exec:0:Running dpkg
pmstatus:testing:0:Installing testing (amd64)
-pmstatus:testing:20:Preparing testing (amd64)
-pmstatus:testing:40:Unpacking testing (amd64)
-pmstatus:testing:60:Preparing to configure testing (amd64)
-pmstatus:dpkg-exec:60:Running dpkg
-pmstatus:testing:60:Configuring testing (amd64)
-pmstatus:testing:80:Configuring testing (amd64)
-pmstatus:testing:100:Installed testing (amd64)" cat apt-progress.log
+pmstatus:testing:16.6667:Preparing testing (amd64)
+pmstatus:testing:33.3333:Unpacking testing (amd64)
+pmstatus:testing:50:Preparing to configure testing (amd64)
+pmstatus:dpkg-exec:50:Running dpkg
+pmstatus:testing:50:Configuring testing (amd64)
+pmstatus:testing:66.6667:Configuring testing (amd64)
+pmstatus:testing:83.3333:Installed testing (amd64)
+pmstatus:dpkg-exec:83.3333:Running dpkg'
# upgrade
exec 3> apt-progress.log
testsuccess aptget install testing=0.8.15 -y -o APT::Status-Fd=3
-testequal "dlstatus:1:0:Retrieving file 1 of 1
+testfileequal './apt-progress.log' 'dlstatus:1:0:Retrieving file 1 of 1
dlstatus:1:20:Retrieving file 1 of 1
pmstatus:dpkg-exec:0:Running dpkg
pmstatus:testing:0:Installing testing (amd64)
-pmstatus:testing:20:Preparing testing (amd64)
-pmstatus:testing:40:Unpacking testing (amd64)
-pmstatus:testing:60:Preparing to configure testing (amd64)
-pmstatus:dpkg-exec:60:Running dpkg
-pmstatus:testing:60:Configuring testing (amd64)
-pmstatus:testing:80:Configuring testing (amd64)
-pmstatus:testing:100:Installed testing (amd64)" cat apt-progress.log
+pmstatus:testing:16.6667:Preparing testing (amd64)
+pmstatus:testing:33.3333:Unpacking testing (amd64)
+pmstatus:testing:50:Preparing to configure testing (amd64)
+pmstatus:dpkg-exec:50:Running dpkg
+pmstatus:testing:50:Configuring testing (amd64)
+pmstatus:testing:66.6667:Configuring testing (amd64)
+pmstatus:testing:83.3333:Installed testing (amd64)
+pmstatus:dpkg-exec:83.3333:Running dpkg'
# reinstall
exec 3> apt-progress.log
testsuccess aptget install testing=0.8.15 --reinstall -y -o APT::Status-Fd=3
-testequal "dlstatus:1:0:Retrieving file 1 of 1
+testfileequal './apt-progress.log' 'dlstatus:1:0:Retrieving file 1 of 1
dlstatus:1:20:Retrieving file 1 of 1
pmstatus:dpkg-exec:0:Running dpkg
pmstatus:testing:0:Installing testing (amd64)
-pmstatus:testing:20:Preparing testing (amd64)
-pmstatus:testing:40:Unpacking testing (amd64)
-pmstatus:testing:60:Preparing to configure testing (amd64)
-pmstatus:dpkg-exec:60:Running dpkg
-pmstatus:testing:60:Configuring testing (amd64)
-pmstatus:testing:80:Configuring testing (amd64)
-pmstatus:testing:100:Installed testing (amd64)" cat apt-progress.log
+pmstatus:testing:16.6667:Preparing testing (amd64)
+pmstatus:testing:33.3333:Unpacking testing (amd64)
+pmstatus:testing:50:Preparing to configure testing (amd64)
+pmstatus:dpkg-exec:50:Running dpkg
+pmstatus:testing:50:Configuring testing (amd64)
+pmstatus:testing:66.6667:Configuring testing (amd64)
+pmstatus:testing:83.3333:Installed testing (amd64)
+pmstatus:dpkg-exec:83.3333:Running dpkg'
# and remove
exec 3> apt-progress.log
testsuccess aptget remove testing -y -o APT::Status-Fd=3
-testequal "pmstatus:dpkg-exec:0:Running dpkg
+testfileequal './apt-progress.log' 'pmstatus:dpkg-exec:0:Running dpkg
pmstatus:testing:0:Removing testing (amd64)
-pmstatus:testing:33.3333:Preparing for removal of testing (amd64)
-pmstatus:testing:66.6667:Removing testing (amd64)
-pmstatus:testing:100:Removed testing (amd64)" cat apt-progress.log
+pmstatus:testing:25:Preparing for removal of testing (amd64)
+pmstatus:testing:50:Removing testing (amd64)
+pmstatus:testing:75:Removed testing (amd64)
+pmstatus:dpkg-exec:75:Running dpkg'
# install non-native and ensure we get proper progress info
exec 3> apt-progress.log
testsuccess aptget install testing2:i386 -y -o APT::Status-Fd=3
-
-# and compare
-testequal "dlstatus:1:0:Retrieving file 1 of 1
+testfileequal './apt-progress.log' 'dlstatus:1:0:Retrieving file 1 of 1
dlstatus:1:20:Retrieving file 1 of 1
pmstatus:dpkg-exec:0:Running dpkg
pmstatus:testing2:0:Installing testing2 (i386)
-pmstatus:testing2:20:Preparing testing2 (i386)
-pmstatus:testing2:40:Unpacking testing2 (i386)
-pmstatus:testing2:60:Preparing to configure testing2 (i386)
-pmstatus:dpkg-exec:60:Running dpkg
-pmstatus:testing2:60:Configuring testing2 (i386)
-pmstatus:testing2:80:Configuring testing2 (i386)
-pmstatus:testing2:100:Installed testing2 (i386)" cat apt-progress.log
+pmstatus:testing2:16.6667:Preparing testing2 (i386)
+pmstatus:testing2:33.3333:Unpacking testing2 (i386)
+pmstatus:testing2:50:Preparing to configure testing2 (i386)
+pmstatus:dpkg-exec:50:Running dpkg
+pmstatus:testing2:50:Configuring testing2 (i386)
+pmstatus:testing2:66.6667:Configuring testing2 (i386)
+pmstatus:testing2:83.3333:Installed testing2 (i386)
+pmstatus:dpkg-exec:83.3333:Running dpkg'
rm -f apt-progress*.log
diff --git a/test/integration/test-apt-progress-fd-deb822 b/test/integration/test-apt-progress-fd-deb822
index 9d227942d..ca7f14cb9 100755
--- a/test/integration/test-apt-progress-fd-deb822
+++ b/test/integration/test-apt-progress-fd-deb822
@@ -16,7 +16,7 @@ setupaptarchive
exec 3> apt-progress.log
testsuccess aptget install testing=0.1 -y -o APT::Status-deb822-Fd=3
-testequal "Status: progress
+testfileequal './apt-progress.log' 'Status: progress
Percent: 0
Message: Running dpkg
@@ -27,38 +27,41 @@ Message: Installing testing (amd64)
Status: progress
Package: testing:amd64
-Percent: 20
+Percent: 16.6667
Message: Preparing testing (amd64)
Status: progress
Package: testing:amd64
-Percent: 40
+Percent: 33.3333
Message: Unpacking testing (amd64)
Status: progress
Package: testing:amd64
-Percent: 60
+Percent: 50
Message: Preparing to configure testing (amd64)
Status: progress
-Percent: 60
+Percent: 50
Message: Running dpkg
Status: progress
Package: testing:amd64
-Percent: 60
+Percent: 50
Message: Configuring testing (amd64)
Status: progress
Package: testing:amd64
-Percent: 80
+Percent: 66.6667
Message: Configuring testing (amd64)
Status: progress
Package: testing:amd64
-Percent: 100
+Percent: 83.3333
Message: Installed testing (amd64)
-" cat apt-progress.log
+Status: progress
+Percent: 83.3333
+Message: Running dpkg
+'
rm -f apt-progress*.log
diff --git a/test/integration/test-apt-progress-fd-error b/test/integration/test-apt-progress-fd-error
index a47095b9b..632300765 100755
--- a/test/integration/test-apt-progress-fd-error
+++ b/test/integration/test-apt-progress-fd-error
@@ -18,7 +18,7 @@ setupaptarchive
exec 3> apt-progress.log
testfailure aptget install foo1 foo2 -y -o APT::Status-Fd=3
msgtest "Ensure correct error message"
-if grep -q "aptarchive/pool/foo2_0.8.15_amd64.deb:40:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log; then
+if grep -q "aptarchive/pool/foo2_0.8.15_amd64.deb:36.3636:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log; then
msgpass
else
cat apt-progress.log
diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822
index d8b2334ad..51fe7bcfe 100755
--- a/test/integration/test-apt-sources-deb822
+++ b/test/integration/test-apt-sources-deb822
@@ -23,46 +23,45 @@ Description: summay
msgtest 'Test sources.list' 'old style'
echo "deb http://ftp.debian.org/debian stable main" > $SOURCES
-testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0
-'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0
-'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris
+testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0
+'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0
+'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 " aptget update --print-uris
msgtest 'Test sources.list' 'simple deb822'
echo "$BASE" > $SOURCES
-testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0
-'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0
-'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris
-
+testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0
+'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0
+'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 " aptget update --print-uris
msgtest 'Test deb822 with' 'two entries'
# Two entries
echo "$BASE" > $SOURCES
echo "" >> $SOURCES
echo "$BASE" | sed s/stable/unstable/ >> $SOURCES
-testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0
+testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0
+'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0
'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0
-'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0
+'http://ftp.debian.org/debian/dists/unstable/InRelease' ftp.debian.org_debian_dists_unstable_InRelease 0
'http://ftp.debian.org/debian/dists/unstable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_unstable_main_binary-i386_Packages 0
-'http://ftp.debian.org/debian/dists/unstable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_unstable_main_i18n_Translation-en 0
-'http://ftp.debian.org/debian/dists/unstable/InRelease' ftp.debian.org_debian_dists_unstable_InRelease 0 " aptget update --print-uris
+'http://ftp.debian.org/debian/dists/unstable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_unstable_main_i18n_Translation-en 0 " aptget update --print-uris
# two suite entries
msgtest 'Test deb822 with' 'two Suite entries'
echo "$BASE" | sed -e "s/stable/stable unstable/" > $SOURCES
-testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0
+testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0
+'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0
'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0
-'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0
+'http://ftp.debian.org/debian/dists/unstable/InRelease' ftp.debian.org_debian_dists_unstable_InRelease 0
'http://ftp.debian.org/debian/dists/unstable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_unstable_main_binary-i386_Packages 0
-'http://ftp.debian.org/debian/dists/unstable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_unstable_main_i18n_Translation-en 0
-'http://ftp.debian.org/debian/dists/unstable/InRelease' ftp.debian.org_debian_dists_unstable_InRelease 0 " aptget update --print-uris
+'http://ftp.debian.org/debian/dists/unstable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_unstable_main_i18n_Translation-en 0 " aptget update --print-uris
msgtest 'Test deb822' 'architecture option'
echo "$BASE" > $SOURCES
echo "Architectures: amd64 armel" >> $SOURCES
-testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/binary-amd64/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-amd64_Packages 0
+testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0
+'http://ftp.debian.org/debian/dists/stable/main/binary-amd64/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-amd64_Packages 0
'http://ftp.debian.org/debian/dists/stable/main/binary-armel/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-armel_Packages 0
-'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0
-'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris
+'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 " aptget update --print-uris
msgtest 'Test old-style sources.list file which has' 'malformed dist'
@@ -85,20 +84,20 @@ testempty aptget update --print-uris
# multiple URIs
msgtest 'Test deb822 sources.list file which has' 'Multiple URIs work'
echo "$BASE" | sed -e 's#http://ftp.debian.org/debian#http://ftp.debian.org/debian http://ftp.de.debian.org/debian#' > $SOURCES
-testequal --nomsg "'http://ftp.de.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.de.debian.org_debian_dists_stable_main_binary-i386_Packages 0
+testequal --nomsg "'http://ftp.de.debian.org/debian/dists/stable/InRelease' ftp.de.debian.org_debian_dists_stable_InRelease 0
+'http://ftp.de.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.de.debian.org_debian_dists_stable_main_binary-i386_Packages 0
'http://ftp.de.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.de.debian.org_debian_dists_stable_main_i18n_Translation-en 0
-'http://ftp.de.debian.org/debian/dists/stable/InRelease' ftp.de.debian.org_debian_dists_stable_InRelease 0
+'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0
'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0
-'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0
-'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris
+'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 " aptget update --print-uris
# multiple Type in one field
msgtest 'Test deb822 sources.list file which has' 'Multiple Types work'
echo "$BASE" | sed -e 's#Types: deb#Types: deb deb-src#' > $SOURCES
-testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/main/source/Sources.bz2' ftp.debian.org_debian_dists_stable_main_source_Sources 0
+testequal --nomsg "'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0
+'http://ftp.debian.org/debian/dists/stable/main/source/Sources.bz2' ftp.debian.org_debian_dists_stable_main_source_Sources 0
'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0
-'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0
-'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 " aptget update --print-uris
+'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 " aptget update --print-uris
# a Suite
msgtest 'Test deb822 sources.list file which has' 'a exact path and no sections'
@@ -107,6 +106,6 @@ Types: deb
URIs: http://emacs.naquadah.org
Suites: stable/
EOF
-testequal --nomsg "'http://emacs.naquadah.org/stable/Packages.bz2' emacs.naquadah.org_stable_Packages 0
-'http://emacs.naquadah.org/stable/en.bz2' emacs.naquadah.org_stable_en 0
-'http://emacs.naquadah.org/stable/InRelease' emacs.naquadah.org_stable_InRelease 0 " aptget update --print-uris
+testequal --nomsg "'http://emacs.naquadah.org/stable/InRelease' emacs.naquadah.org_stable_InRelease 0
+'http://emacs.naquadah.org/stable/Packages.bz2' emacs.naquadah.org_stable_Packages 0
+'http://emacs.naquadah.org/stable/en.bz2' emacs.naquadah.org_stable_en 0 " aptget update --print-uris
diff --git a/test/integration/test-apt-tagfile-fields-order b/test/integration/test-apt-tagfile-fields-order
new file mode 100755
index 000000000..27d5c14ff
--- /dev/null
+++ b/test/integration/test-apt-tagfile-fields-order
@@ -0,0 +1,82 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+
+dpkg_field_ordered_list() {
+ local FIELDS="$(perl -e "
+use Dpkg::Control;
+use Dpkg::Control::Fields;
+foreach \$f (field_ordered_list(${1})) {
+ print \"\$f\\n\";
+}" | sort -u)"
+ if [ -z "$FIELDS" ]; then
+ msgfail 'Could not get fields via libdpkg-perl'
+ fi
+ echo "$FIELDS"
+}
+
+comparelsts() {
+ local DIFFOUTPUT="$(diff -u apt.lst dpkg.lst || true)"
+ if echo "$DIFFOUTPUT" | grep -q '^+[^+]'; then
+ echo
+ echo "$DIFFOUTPUT" | grep '^[+-][^+-]'
+ msgfail
+ else
+ msgpass
+ fi
+}
+
+msgtest 'Check that apt knows all fields dpkg orders in' 'Packages'
+dpkg_field_ordered_list 'CTRL_INDEX_PKG' > dpkg.lst
+sed -ne 's#^ "\(.*\)",.*$#\1#p' ${SOURCEDIRECTORY}/apt-pkg/tagfile-order.c | sed -n '/^Package$/,/^Package$/ p' | head -n -1 | sort -u > apt.lst
+comparelsts
+
+msgtest 'Check that apt knows all fields dpkg orders in' 'status'
+dpkg_field_ordered_list 'CTRL_FILE_STATUS' > dpkg.lst
+comparelsts
+
+msgtest 'Check that apt knows all fields dpkg orders in' 'DEBIAN/control'
+dpkg_field_ordered_list 'CTRL_PKG_DEB' > dpkg.lst
+comparelsts
+
+msgtest 'Check that apt knows all fields dpkg orders in' 'Sources'
+dpkg_field_ordered_list 'CTRL_INDEX_SRC' > dpkg.lst
+echo 'Package' > apt.tmp
+sed -ne 's#^ "\(.*\)",.*$#\1#p' ${SOURCEDIRECTORY}/apt-pkg/tagfile-order.c | sed '/^Package$/,/^Package$/ d' >> apt.tmp
+sort -u apt.tmp > apt.lst
+comparelsts
+
+msgtest 'Check that apt knows all fields dpkg orders in' 'dsc'
+dpkg_field_ordered_list 'CTRL_PKG_SRC' > dpkg.lst
+comparelsts
+
+# HACK, but there is no good way to acquire sources in tests and/or to remember to run this regular manually
+if [ "$USER" = 'david' ]; then
+ msgtest 'Check if we have somewhere the sources of' 'dpkg'
+ DPKGSOURCE="$(locate dpkg/lib/dpkg/parse.c | head -n 1 || true)"
+ if [ -z "$DPKGSOURCE" ]; then
+ msgskip 'Not found'
+ else
+ msgpass
+ msgtest 'Check that apt knows about all fields' 'dpkg parses'
+ sed -n 's#^.*FIELD("\(.*\)").*$#\1#p' "${DPKGSOURCE}" | sort -u > dpkg.lst
+ sed -ne 's#^ "\(.*\)",.*$#\1#p' ${SOURCEDIRECTORY}/apt-pkg/tagfile-order.c | sed -n '/^Package$/,/^Package$/ p' | head -n -1 | sort -u > apt.lst
+ comparelsts
+ fi
+
+ msgtest 'Check if we have somewhere the sources of' 'dak'
+ DAKSOURCE="$(locate dak/setup/core-init.d/080_metadatakeys | head -n 1 || true)"
+ if [ -z "$DAKSOURCE" ]; then
+ msgskip 'Not found'
+ else
+ msgpass
+ msgtest 'Check that apt knows about all fields' 'dak knows'
+ # dak mixes both, so we can only check with the mixed one as well
+ sed -ne "s#^.* VALUES ('\(.*\)', \(.*\)).*\$#\1 \2#p" "${DAKSOURCE}" | cut -d ' ' -f 1 | sort -u > dpkg.lst
+ sed -ne 's#^ "\(.*\)",.*$#\1#p' ${SOURCEDIRECTORY}/apt-pkg/tagfile-order.c | sort -u > apt.lst
+ comparelsts
+ fi
+fi
diff --git a/test/integration/test-apt-translation-has-no-packages b/test/integration/test-apt-translation-has-no-packages
index bb2353a33..cf5b56243 100755
--- a/test/integration/test-apt-translation-has-no-packages
+++ b/test/integration/test-apt-translation-has-no-packages
@@ -17,7 +17,7 @@ configarchitecture "amd64"
if [ ! -x ${BUILDDIRECTORY}/apt ]; then
msgmsg "No ${BUILDDIRECTORY}/apt"
- msgskip
+ msgskip
exit 0
fi
@@ -33,9 +33,9 @@ cp $APTARCHIVE/dists/unstable/main/binary-amd64/Packages \
# ensure that there is no Version for the package foo generated out of
# the corrupted Translation-en file
-testequal "foo:
+testsuccessequal "foo:
Installed: (none)
Candidate: 1.0
Version table:
1.0 0
- 500 file:$APTARCHIVE/ unstable/main amd64 Packages" aptcache policy foo
+ 500 file:$APTARCHIVE unstable/main amd64 Packages" aptcache policy foo
diff --git a/test/integration/test-apt-update-expected-size b/test/integration/test-apt-update-expected-size
index 045217a77..24ca85133 100755
--- a/test/integration/test-apt-update-expected-size
+++ b/test/integration/test-apt-update-expected-size
@@ -10,35 +10,68 @@ configarchitecture "i386"
insertpackage 'unstable' 'apt' 'all' '1.0'
setupaptarchive --no-update
+cp -a aptarchive/dists aptarchive/dists.good
+
+test_inreleasetoobig() {
+ # make InRelease really big to trigger fallback
+ dd if=/dev/zero of=aptarchive/dists/unstable/InRelease bs=1M count=2 2>/dev/null
+ touch -d '+1hour' aptarchive/dists/unstable/InRelease
+ testsuccess aptget update -o Apt::Get::List-Cleanup=0 -o acquire::MaxReleaseFileSize=$((1*1000*1000)) -o Debug::pkgAcquire::worker=0
+ msgtest 'Check that the max write warning is triggered'
+ cp rootdir/tmp/testsuccess.output update.output
+ testsuccess --nomsg grep -q 'Writing more data than expected' update.output
+ rm -f update.output
+ # ensure the failed InRelease file got renamed
+ testsuccess ls rootdir/var/lib/apt/lists/partial/*InRelease.FAILED
+}
+
+test_packagestoobig() {
+ insertpackage 'unstable' 'foo' 'all' '1.0'
+ buildaptarchivefromfiles '+1 hour'
+ signreleasefiles
+ # append junk at the end of the Packages.gz/Packages
+ SIZE="$(stat --printf=%s aptarchive/dists/unstable/main/binary-i386/Packages)"
+ find aptarchive/dists -name 'Packages*' | while read pkg; do
+ echo "1234567890" >> "$pkg"
+ touch -d '+1hour' "$pkg"
+ done
+ NEW_SIZE="$(stat --printf=%s aptarchive/dists/unstable/main/binary-i386/Packages)"
+ testfailuremsg "W: Failed to fetch ${1}/dists/unstable/main/binary-i386/Packages Writing more data than expected ($NEW_SIZE > $SIZE)
+E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::Transaction=0
+}
+
+methodtest() {
+ # less complicated test setup this way
+ webserverconfig 'aptwebserver::support::modified-since' 'false' "$1"
+ webserverconfig 'aptwebserver::support::last-modified' 'false' "$1" # curl is clever and sees hits here also
+
+ msgmsg 'Test with' "$1" 'and clean start'
+ rm -rf rootdir/var/lib/apt/lists rootdir/var/lib/apt/lists.good
+ # normal update works fine
+ testsuccess aptget update
+ mv rootdir/var/lib/apt/lists rootdir/var/lib/apt/lists.good
+
+ # starting fresh works
+ test_inreleasetoobig "$1"
+ rm -rf aptarchive/dists rootdir/var/lib/apt/lists
+ cp -a aptarchive/dists.good aptarchive/dists
+ test_packagestoobig "$1"
+ rm -rf aptarchive/dists rootdir/var/lib/apt/lists
+ cp -a aptarchive/dists.good aptarchive/dists
+
+ msgmsg 'Test with' "$1" 'and existing old data'
+ cp -a rootdir/var/lib/apt/lists.good rootdir/var/lib/apt/lists
+ test_inreleasetoobig "$1"
+ rm -rf aptarchive/dists rootdir/var/lib/apt/lists
+ cp -a rootdir/var/lib/apt/lists.good rootdir/var/lib/apt/lists
+ cp -a aptarchive/dists.good aptarchive/dists
+ test_packagestoobig "$1"
+ rm -rf aptarchive/dists
+ cp -a aptarchive/dists.good aptarchive/dists
+}
+
changetowebserver
+methodtest 'http://localhost:8080'
-# normal update works fine
-testsuccess aptget update
-
-# make InRelease really big to trigger fallback
-mv aptarchive/dists/unstable/InRelease aptarchive/dists/unstable/InRelease.good
-dd if=/dev/zero of=aptarchive/dists/unstable/InRelease bs=1M count=2 2>/dev/null
-touch -d '+1hour' aptarchive/dists/unstable/InRelease
-testsuccess aptget update -o Apt::Get::List-Cleanup=0 -o acquire::MaxReleaseFileSize=$((1*1000*1000)) -o Debug::pkgAcquire::worker=0
-msgtest 'Check that the max write warning is triggered'
-if grep -q "Writing more data than expected" rootdir/tmp/testsuccess.output; then
- msgpass
-else
- cat rootdir/tmp/testsuccess.output
- msgfail
-fi
-# ensure the failed InRelease file got renamed
-testsuccess ls rootdir/var/lib/apt/lists/partial/*InRelease.FAILED
-mv aptarchive/dists/unstable/InRelease.good aptarchive/dists/unstable/InRelease
-
-
-# append junk at the end of the Packages.gz/Packages
-SIZE="$(stat --printf=%s aptarchive/dists/unstable/main/binary-i386/Packages)"
-find aptarchive -name 'Packages*' | while read pkg; do
- echo "1234567890" >> "$pkg"
-done
-NEW_SIZE="$(stat --printf=%s aptarchive/dists/unstable/main/binary-i386/Packages)"
-rm -f rootdir/var/lib/apt/lists/localhost*
-testequal "W: Failed to fetch http://localhost:8080/dists/unstable/main/binary-i386/Packages Writing more data than expected ($NEW_SIZE > $SIZE)
-
-E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
+changetohttpswebserver
+methodtest 'https://localhost:4433'
diff --git a/test/integration/test-apt-update-file b/test/integration/test-apt-update-file
index 1ecf9a38a..94b604f0e 100755
--- a/test/integration/test-apt-update-file
+++ b/test/integration/test-apt-update-file
@@ -22,14 +22,33 @@ addtrap 'prefix' 'chmod 750 aptarchive/dists/unstable/main/binary-amd64;'
chmod 550 aptarchive/dists/unstable/main/binary-amd64
testsuccess aptget update
+
+# the release files aren't an IMS-hit, but the indexes are
+redatereleasefiles '+1 hour'
+
+# we don't download the index if it isn't updated
testsuccess aptget update -o Debug::pkgAcquire::Auth=1
+# file:/ isn't shown in the log, so see if it was downloaded anyhow
cp -a rootdir/tmp/testsuccess.output rootdir/tmp/update.output
+canary="SHA512:$(bzcat aptarchive/dists/unstable/main/binary-amd64/Packages.bz2 | sha512sum |cut -f1 -d' ')"
+testfailure grep -- "$canary" rootdir/tmp/update.output
+
+testfoo() {
+ # foo is still available
+ testsuccess aptget install -s foo
+ testsuccess aptcache showsrc foo
+ testsuccess aptget source foo --print-uris
+}
+testfoo
-# ensure that the hash of the uncompressed file was verified even on a local ims hit
+# the release file is new again, the index still isn't, but it is somehow gone now from disk
+redatereleasefiles '+2 hour'
+find rootdir/var/lib/apt/lists -name '*_Packages*' -delete
+
+testsuccess aptget update -o Debug::pkgAcquire::Auth=1
+# file:/ isn't shown in the log, so see if it was downloaded anyhow
+cp -a rootdir/tmp/testsuccess.output rootdir/tmp/update.output
canary="SHA512:$(bzcat aptarchive/dists/unstable/main/binary-amd64/Packages.bz2 | sha512sum |cut -f1 -d' ')"
testsuccess grep -- "$canary" rootdir/tmp/update.output
-# foo is still available
-testsuccess aptget install -s foo
-testsuccess aptcache showsrc foo
-testsuccess aptget source foo --print-uris
+testfoo
diff --git a/test/integration/test-apt-update-ims b/test/integration/test-apt-update-ims
index 5394a9f30..33b4ed1b9 100755
--- a/test/integration/test-apt-update-ims
+++ b/test/integration/test-apt-update-ims
@@ -6,85 +6,161 @@ TESTDIR=$(readlink -f $(dirname $0))
setupenvironment
configarchitecture 'amd64'
-buildsimplenativepackage 'unrelated' 'all' '0.5~squeeze1' 'unstable'
+insertpackage 'unstable' 'unrelated' 'all' '0.5~squeeze1'
+insertsource 'unstable' 'unrelated' 'all' '0.5~squeeze1'
setupaptarchive --no-update
changetowebserver
runtest() {
- configallowinsecurerepositories "${1:-false}"
+ if [ -n "$1" ]; then
+ configallowinsecurerepositories 'true'
+ else
+ configallowinsecurerepositories 'false'
+ fi
- rm -f rootdir/var/lib/apt/lists/localhost*
+ rm -rf rootdir/var/lib/apt/lists/
- if [ "$1" = 'true' ]; then
- testwarning aptget update
- else
- testsuccess aptget update
+ local TEST="test${1:-success}"
+ $TEST aptget update
+ if [ "$1" = 'failure' ]; then
+ # accept the outdated Release file so we can check Hit behaviour
+ "test${2:-success}" aptget update -o Acquire::Min-ValidTime=99999999999
fi
+ listcurrentlistsdirectory > listsdir.lst
+ testsuccess grep '_Packages\(\.gz\)\?$' listsdir.lst
+ testsuccess grep '_Sources\(\.gz\)\?$' listsdir.lst
+ testsuccess grep '_Translation-en\(\.gz\)\?$' listsdir.lst
# ensure no leftovers in partial
- testfailure ls "rootdir/var/lib/apt/lists/partial/*"
+ testfailure ls 'rootdir/var/lib/apt/lists/partial/*'
# check that I-M-S header is kept in redirections
- testequal "$EXPECT" aptget update -o Debug::pkgAcquire::Worker=0 -o Debug::Acquire::http=0
-
- # ensure that we still do a hash check on ims hit
- msgtest 'Test I-M-S' 'reverify'
- aptget update -o Debug::pkgAcquire::Auth=1 2>&1 | grep -A2 'RecivedHash:' | grep -q -- '- SHA' && msgpass || msgfail
+ echo "$EXPECT" | sed -e 's#(invalid since [^)]\+)#(invalid since)#' > expected.output
+ $TEST aptget update -o Debug::pkgAcquire::Worker=0 -o Debug::Acquire::http=0
+ sed -i -e 's#(invalid since [^)]\+)#(invalid since)#' rootdir/tmp/${TEST}.output
+ testequal "$(cat expected.output)" cat rootdir/tmp/${TEST}.output
+ testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
+
+ # ensure that we still do a hash check for other files on ims hit of Release
+ if grep -q '^Hit:[0-9]\+ .* InRelease$' expected.output || ! grep -q '^Ign:[0-9]\+ .* Release\(\.gpg\)\?$' expected.output; then
+ $TEST aptget update -o Debug::Acquire::gpgv=1
+ cp rootdir/tmp/${TEST}.output goodsign.output
+ testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
+ testsuccess grep '^Got GOODSIG, key ID:GOODSIG' goodsign.output
+ fi
# ensure no leftovers in partial
- testfailure ls "rootdir/var/lib/apt/lists/partial/*"
+ testfailure ls 'rootdir/var/lib/apt/lists/partial/*'
}
-msgmsg "InRelease"
-EXPECT="Hit http://localhost:8080 unstable InRelease
-Hit http://localhost:8080 unstable/main Sources
-Hit http://localhost:8080 unstable/main amd64 Packages
-Hit http://localhost:8080 unstable/main Translation-en
-Reading package lists..."
-# with InRelease
+msgmsg 'InRelease'
+EXPECT='Hit:1 http://localhost:8080 unstable InRelease
+Reading package lists...'
+echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
runtest
-
-# with gzip
-echo "Acquire::GzipIndexes "1";" > rootdir/etc/apt/apt.conf.d/02compressindex
+echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex
runtest
-msgmsg "Release/Release.gpg"
-# with Release/Release.gpg
-EXPECT="Ign http://localhost:8080 unstable InRelease
+msgmsg 'Release/Release.gpg'
+EXPECT='Ign:1 http://localhost:8080 unstable InRelease
404 Not Found
-Hit http://localhost:8080 unstable Release
-Hit http://localhost:8080 unstable Release.gpg
-Hit http://localhost:8080 unstable/main Sources
-Hit http://localhost:8080 unstable/main amd64 Packages
-Hit http://localhost:8080 unstable/main Translation-en
-Reading package lists..."
-
+Hit:2 http://localhost:8080 unstable Release
+Reading package lists...'
find aptarchive -name 'InRelease' -delete
-
-echo "Acquire::GzipIndexes "0";" > rootdir/etc/apt/apt.conf.d/02compressindex
+echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
runtest
-
-echo "Acquire::GzipIndexes "1";" > rootdir/etc/apt/apt.conf.d/02compressindex
+echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex
runtest
-# no Release.gpg or InRelease
-msgmsg "Release only"
-EXPECT="Ign http://localhost:8080 unstable InRelease
+msgmsg 'Release only'
+EXPECT="Ign:1 http://localhost:8080 unstable InRelease
404 Not Found
-Hit http://localhost:8080 unstable Release
-Ign http://localhost:8080 unstable Release.gpg
+Hit:2 http://localhost:8080 unstable Release
+Ign:3 http://localhost:8080 unstable Release.gpg
404 Not Found
-Hit http://localhost:8080 unstable/main Sources
-Hit http://localhost:8080 unstable/main amd64 Packages
-Hit http://localhost:8080 unstable/main Translation-en
Reading package lists...
-W: The data from 'http://localhost:8080 unstable Release.gpg' is not signed. Packages from that repository can not be authenticated."
+W: The data from 'http://localhost:8080 unstable Release' is not signed. Packages from that repository can not be authenticated."
+find aptarchive -name 'Release.gpg' -delete
+echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
+runtest 'warning'
+echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex
+runtest 'warning'
+
+
+# make the release file old
+find aptarchive -name '*Release' -exec sed -i \
+ -e "s#^Date: .*\$#Date: $(date -d '-2 weeks' '+%a, %d %b %Y %H:%M:%S %Z')#" \
+ -e '/^Valid-Until: / d' -e "/^Date: / a\
+Valid-Until: $(date -d '-1 weeks' '+%a, %d %b %Y %H:%M:%S %Z')" '{}' \;
+signreleasefiles
+
+msgmsg 'expired InRelease'
+EXPECT='Hit:1 http://localhost:8080 unstable InRelease
+E: Release file for http://localhost:8080/dists/unstable/InRelease is expired (invalid since). Updates for this repository will not be applied.'
+echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
+runtest 'failure'
+echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex
+runtest 'failure'
+
+msgmsg 'expired Release/Release.gpg'
+EXPECT='Ign:1 http://localhost:8080 unstable InRelease
+ 404 Not Found
+Hit:2 http://localhost:8080 unstable Release
+E: Release file for http://localhost:8080/dists/unstable/Release is expired (invalid since). Updates for this repository will not be applied.'
+find aptarchive -name 'InRelease' -delete
+echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
+runtest 'failure'
+echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex
+runtest 'failure'
+msgmsg 'expired Release only'
+EXPECT="Ign:1 http://localhost:8080 unstable InRelease
+ 404 Not Found
+Hit:2 http://localhost:8080 unstable Release
+Ign:3 http://localhost:8080 unstable Release.gpg
+ 404 Not Found
+W: The data from 'http://localhost:8080 unstable Release' is not signed. Packages from that repository can not be authenticated.
+E: Release file for http://localhost:8080/dists/unstable/Release is expired (invalid since). Updates for this repository will not be applied."
find aptarchive -name 'Release.gpg' -delete
+echo 'Acquire::GzipIndexes "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
+runtest 'failure' 'warning'
+echo 'Acquire::GzipIndexes "1";' > rootdir/etc/apt/apt.conf.d/02compressindex
+runtest 'failure' 'warning'
-echo "Acquire::GzipIndexes "0";" > rootdir/etc/apt/apt.conf.d/02compressindex
-runtest "true"
-echo "Acquire::GzipIndexes "1";" > rootdir/etc/apt/apt.conf.d/02compressindex
-runtest "true"
+msgmsg 'no Release at all'
+EXPECT="Ign:1 http://localhost:8080 unstable InRelease
+ 404 Not Found
+Ign:2 http://localhost:8080 unstable Release
+ 404 Not Found
+Ign:3 http://localhost:8080 unstable/main Sources
+ 404 Not Found
+Ign:4 http://localhost:8080 unstable/main amd64 Packages
+ 404 Not Found
+Ign:5 http://localhost:8080 unstable/main Translation-en
+ 404 Not Found
+Ign:3 http://localhost:8080 unstable/main Sources
+ 404 Not Found
+Ign:4 http://localhost:8080 unstable/main amd64 Packages
+ 404 Not Found
+Ign:5 http://localhost:8080 unstable/main Translation-en
+ 404 Not Found
+Ign:3 http://localhost:8080 unstable/main Sources
+ 404 Not Found
+Ign:4 http://localhost:8080 unstable/main amd64 Packages
+ 404 Not Found
+Ign:5 http://localhost:8080 unstable/main Translation-en
+ 404 Not Found
+Hit:3 http://localhost:8080 unstable/main Sources
+Hit:4 http://localhost:8080 unstable/main amd64 Packages
+Hit:5 http://localhost:8080 unstable/main Translation-en
+Reading package lists...
+W: The repository 'http://localhost:8080 unstable Release' does not have a Release file. This is deprecated, please contact the owner of the repository."
+find aptarchive -name '*Release*' -delete
+echo 'Acquire::GzipIndexes "0";
+Acquire::PDiffs "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
+runtest 'warning'
+echo 'Acquire::GzipIndexes "1";
+Acquire::PDiffs "0";' > rootdir/etc/apt/apt.conf.d/02compressindex
+runtest 'warning'
diff --git a/test/integration/test-apt-update-nofallback b/test/integration/test-apt-update-nofallback
index e82a976a6..2ded73122 100755
--- a/test/integration/test-apt-update-nofallback
+++ b/test/integration/test-apt-update-nofallback
@@ -8,6 +8,7 @@ set -e
simulate_mitm_and_inject_evil_package()
{
+ redatereleasefiles '+1 hour'
rm -f $APTARCHIVE/dists/unstable/InRelease
rm -f $APTARCHIVE/dists/unstable/Release.gpg
inject_evil_package
@@ -27,18 +28,19 @@ Description: an autogenerated evil package
EOF
# avoid ims hit
touch -d '+1hour' aptarchive/dists/unstable/main/binary-i386/Packages
+ compressfile aptarchive/dists/unstable/main/binary-i386/Packages
}
assert_update_is_refused_and_last_good_state_used()
{
- testequal "E: The repository 'file: unstable Release.gpg' is no longer signed." aptget update -qq
+ testfailuremsg "E: The repository 'file:${APTARCHIVE} unstable Release' is no longer signed." aptget update
assert_repo_is_intact
}
assert_repo_is_intact()
{
- testequal "foo/unstable 2.0 all" apt list -q
+ testsuccessequal "foo/unstable 2.0 all" apt list -q
testsuccess aptget install -y -s foo
testfailure aptget install -y evil
testsuccess aptget source foo --print-uris
@@ -86,18 +88,18 @@ test_from_inrelease_to_unsigned_with_override()
{
# setup archive with InRelease file
setupaptarchive_with_lists_clean
- # FIXME: is not what the server reported 4104 4106
- testsuccess aptget update #-o Debug::pkgAcquire::Worker=1
+ testsuccess aptget update
# simulate moving to a unsigned but otherwise valid repo
simulate_mitm_and_inject_evil_package
- generatereleasefiles
+ generatereleasefiles '+2 hours'
+ find $APTARCHIVE -name '*Packages*' -exec touch -d '+2 hours' {} \;
# and ensure we can update to it (with enough force)
testwarning aptget update --allow-insecure-repositories \
- -o Acquire::AllowDowngradeToInsecureRepositories=1
+ -o Acquire::AllowDowngradeToInsecureRepositories=1 -o Debug::pkgAcquire::Worker=1 -o Debug::pkgAcquire::Auth=1
# but that the individual packages are still considered untrusted
- testequal "WARNING: The following packages cannot be authenticated!
+ testfailureequal "WARNING: The following packages cannot be authenticated!
evil
E: There are problems and -y was used without --force-yes" aptget install -qq -y evil
}
@@ -149,7 +151,7 @@ test_subvert_inrelease()
# replace InRelease with something else
mv $APTARCHIVE/dists/unstable/Release $APTARCHIVE/dists/unstable/InRelease
- testequal "W: Failed to fetch file:${APTARCHIVE}/dists/unstable/InRelease Does not start with a cleartext signature
+ testfailureequal "W: Failed to fetch file:${APTARCHIVE}/dists/unstable/InRelease Does not start with a cleartext signature
E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
@@ -166,10 +168,10 @@ test_inrelease_to_invalid_inrelease()
listcurrentlistsdirectory > lists.before
# now remove InRelease and subvert Release do no longer verify
- sed -i 's/Codename.*/Codename: evil!'/ $APTARCHIVE/dists/unstable/InRelease
+ sed -i 's/^Codename:.*/Codename: evil!/' $APTARCHIVE/dists/unstable/InRelease
inject_evil_package
- testequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file: unstable InRelease: The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>
+ testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file:${APTARCHIVE} unstable InRelease: The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>
W: Failed to fetch file:${APTARCHIVE}/dists/unstable/InRelease The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>
@@ -193,7 +195,7 @@ test_release_gpg_to_invalid_release_release_gpg()
echo "Some evil data" >> $APTARCHIVE/dists/unstable/Release
inject_evil_package
- testequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file: unstable Release.gpg: The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>
+ testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file:${APTARCHIVE} unstable Release: The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>
W: Failed to fetch file:${APTARCHIVE}/dists/unstable/Release.gpg The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org>
diff --git a/test/integration/test-apt-update-not-modified b/test/integration/test-apt-update-not-modified
new file mode 100755
index 000000000..6d176a655
--- /dev/null
+++ b/test/integration/test-apt-update-not-modified
@@ -0,0 +1,161 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'amd64' 'i386'
+
+insertpackage 'unstable' 'apt' 'all' '1.0'
+
+setupaptarchive --no-update
+
+methodtest() {
+ msgmsg 'Test InRelease with' "$1"
+ rm -rf rootdir/var/lib/apt/lists
+ cp -a aptarchive/dists aptarchive/dists.good
+ # get our cache populated
+ testsuccess aptget update
+ listcurrentlistsdirectory > listsdir.lst
+
+ # hit again with a good cache
+ testsuccessequal "Hit:1 $1 unstable InRelease
+Reading package lists..." aptget update
+ testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
+
+ # drop an architecture, which means the file should be gone now
+ configarchitecture 'i386'
+ sed '/_binary-amd64_Packages/ d' listsdir.lst > listsdir-without-amd64.lst
+ testsuccessequal "Hit:1 $1 unstable InRelease
+Reading package lists..." aptget update
+ testfileequal 'listsdir-without-amd64.lst' "$(listcurrentlistsdirectory)"
+
+ # readd arch so its downloaded again…
+ configarchitecture 'amd64' 'i386'
+ # … but oh noes, hashsum mismatch!
+ find aptarchive/dists/unstable/main/binary-amd64/ -type f -delete
+ cat >> aptarchive/dists/unstable/main/binary-amd64/Packages <<EOF
+
+Package: thisisbad
+Architecture: amd64
+Version: 1
+EOF
+ compressfile aptarchive/dists/unstable/main/binary-amd64/Packages
+ testfailureequal "Hit:1 $1 unstable InRelease
+Get:2 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
+Err:2 $1 unstable/main amd64 Packages
+ Hash Sum mismatch
+W: Failed to fetch $1/dists/unstable/main/binary-amd64/Packages.gz Hash Sum mismatch
+
+E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update
+ testfileequal 'listsdir-without-amd64.lst' "$(listcurrentlistsdirectory)"
+ rm -rf aptarchive/dists
+ cp -a aptarchive/dists.good aptarchive/dists
+
+ # … now everything is fine again
+ testsuccessequal "Hit:1 $1 unstable InRelease
+Get:2 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
+Reading package lists..." aptget update
+ testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
+
+ webserverconfig 'aptwebserver::support::modified-since' 'false'
+ webserverconfig 'aptwebserver::support::last-modified' 'false'
+ testsuccessequal "Get:1 $1 unstable InRelease [$(stat -c '%s' 'aptarchive/dists/unstable/InRelease') B]
+Reading package lists..." aptget update
+ webserverconfig 'aptwebserver::support::modified-since' 'true'
+ webserverconfig 'aptwebserver::support::last-modified' 'true'
+
+ msgmsg 'Test Release.gpg with' "$1"
+ rm -rf rootdir/var/lib/apt/lists
+ find aptarchive/dists -name 'InRelease' -delete
+ # get our cache populated
+ testsuccess aptget update
+ listcurrentlistsdirectory > listsdir.lst
+
+ # hit again with a good cache
+ testsuccessequal "Ign:1 $1 unstable InRelease
+ 404 Not Found
+Hit:2 $1 unstable Release
+Reading package lists..." aptget update
+ testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
+
+ # drop an architecture, which means the file should be gone now
+ configarchitecture 'i386'
+ sed '/_binary-amd64_Packages/ d' listsdir.lst > listsdir-without-amd64.lst
+ testsuccessequal "Ign:1 $1 unstable InRelease
+ 404 Not Found
+Hit:2 $1 unstable Release
+Reading package lists..." aptget update
+ testfileequal 'listsdir-without-amd64.lst' "$(listcurrentlistsdirectory)"
+
+ # readd arch so its downloaded again…
+ configarchitecture 'amd64' 'i386'
+ # … but oh noes, hashsum mismatch!
+ find aptarchive/dists/unstable/main/binary-amd64/ -type f -delete
+ cat >> aptarchive/dists/unstable/main/binary-amd64/Packages <<EOF
+
+Package: thisisbad
+Architecture: amd64
+Version: 1
+EOF
+ compressfile aptarchive/dists/unstable/main/binary-amd64/Packages
+ testfailureequal "Ign:1 $1 unstable InRelease
+ 404 Not Found
+Hit:2 $1 unstable Release
+Get:4 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
+Err:4 $1 unstable/main amd64 Packages
+ Hash Sum mismatch
+W: Failed to fetch $1/dists/unstable/main/binary-amd64/Packages.gz Hash Sum mismatch
+
+E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update
+ testfileequal 'listsdir-without-amd64.lst' "$(listcurrentlistsdirectory)"
+ rm -rf aptarchive/dists
+ cp -a aptarchive/dists.good aptarchive/dists
+ find aptarchive/dists -name 'InRelease' -delete
+
+ # … now everything is fine again
+ testsuccessequal "Ign:1 $1 unstable InRelease
+ 404 Not Found
+Hit:2 $1 unstable Release
+Get:4 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
+Reading package lists..." aptget update
+ testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
+
+ webserverconfig 'aptwebserver::support::modified-since' 'false'
+ webserverconfig 'aptwebserver::support::last-modified' 'false'
+ testsuccessequal "Ign:1 $1 unstable InRelease
+ 404 Not Found
+Get:2 $1 unstable Release [$(stat -c '%s' 'aptarchive/dists/unstable/Release') B]
+Reading package lists..." aptget update
+ webserverconfig 'aptwebserver::support::modified-since' 'true'
+ webserverconfig 'aptwebserver::support::last-modified' 'true'
+
+ rm -rf aptarchive/dists
+ cp -a aptarchive/dists.good aptarchive/dists
+
+ # new release file, but the indexes are the same
+ redatereleasefiles '+2 hours'
+
+ rm -rf rootdir/var/lib/apt/lists.good
+ cp -a rootdir/var/lib/apt/lists rootdir/var/lib/apt/lists.good
+ testsuccessequal "Get:1 $1 unstable InRelease [$(stat -c '%s' 'aptarchive/dists/unstable/InRelease') B]
+Reading package lists..." aptget update
+
+ rm -rf rootdir/var/lib/apt/lists
+ cp -a rootdir/var/lib/apt/lists.good rootdir/var/lib/apt/lists
+ find rootdir/var/lib/apt/lists -name '*_Packages*' -delete
+ testsuccessequal "Get:1 $1 unstable InRelease [$(stat -c '%s' 'aptarchive/dists/unstable/InRelease') B]
+Get:2 $1 unstable/main amd64 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-amd64/Packages.gz') B]
+Get:3 $1 unstable/main i386 Packages [$(stat -c '%s' 'aptarchive/dists/unstable/main/binary-i386/Packages.gz') B]
+Reading package lists..." aptget update
+
+ rm -rf aptarchive/dists
+ cp -a aptarchive/dists.good aptarchive/dists
+}
+
+changetowebserver
+methodtest 'http://localhost:8080'
+
+changetohttpswebserver
+methodtest 'https://localhost:4433'
diff --git a/test/integration/test-apt-update-rollback b/test/integration/test-apt-update-rollback
index 9efc194a0..70619dd08 100755
--- a/test/integration/test-apt-update-rollback
+++ b/test/integration/test-apt-update-rollback
@@ -38,7 +38,7 @@ start_with_good_inrelease() {
create_fresh_archive
testsuccess aptget update
listcurrentlistsdirectory > lists.before
- testequal "old/unstable 1.0 all" apt list -q
+ testsuccessequal "old/unstable 1.0 all" apt list -q
}
test_inrelease_to_new_inrelease() {
@@ -47,7 +47,7 @@ test_inrelease_to_new_inrelease() {
add_new_package '+1hour'
testsuccess aptget update -o Debug::Acquire::Transaction=1
- testequal "new/unstable 1.0 all
+ testsuccessequal "new/unstable 1.0 all
old/unstable 1.0 all" apt list -q
}
@@ -60,12 +60,12 @@ test_inrelease_to_broken_hash_reverts_all() {
break_repository_sources_index '+1hour'
# test the error condition
- testequal "W: Failed to fetch file:${APTARCHIVE}/dists/unstable/main/source/Sources Hash Sum mismatch
+ testfailureequal "W: Failed to fetch file:${APTARCHIVE}/dists/unstable/main/source/Sources.gz Hash Sum mismatch
E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
# ensure that the Packages file is also rolled back
testfileequal lists.before "$(listcurrentlistsdirectory)"
- testequal "E: Unable to locate package new" aptget install new -s -qq
+ testfailureequal "E: Unable to locate package new" aptget install new -s -qq
}
test_inrelease_to_valid_release() {
@@ -78,7 +78,7 @@ test_inrelease_to_valid_release() {
rm $APTARCHIVE/dists/unstable/Release.gpg
# update fails
- testequal "E: The repository 'file: unstable Release.gpg' is no longer signed." aptget update -qq
+ testfailureequal "E: The repository 'file:${APTARCHIVE} unstable Release' is no longer signed." aptget update -qq
# test that security downgrade was not successful
testfileequal lists.before "$(listcurrentlistsdirectory)"
@@ -101,7 +101,7 @@ test_inrelease_to_release_reverts_all() {
break_repository_sources_index '+1hour'
# ensure error
- testequal "E: The repository 'file: unstable Release.gpg' is no longer signed." aptget update -qq # -o Debug::acquire::transaction=1
+ testfailureequal "E: The repository 'file:${APTARCHIVE} unstable Release' is no longer signed." aptget update -qq # -o Debug::acquire::transaction=1
# ensure that the Packages file is also rolled back
testfileequal lists.before "$(listcurrentlistsdirectory)"
@@ -119,7 +119,7 @@ test_unauthenticated_to_invalid_inrelease() {
testwarning aptget update --allow-insecure-repositories
listcurrentlistsdirectory > lists.before
- testequal "WARNING: The following packages cannot be authenticated!
+ testfailureequal "WARNING: The following packages cannot be authenticated!
old
E: There are problems and -y was used without --force-yes" aptget install -qq -y old
@@ -127,13 +127,13 @@ E: There are problems and -y was used without --force-yes" aptget install -qq -y
add_new_package '+1hour'
break_repository_sources_index '+1hour'
- testequal "W: Failed to fetch file:$APTARCHIVE/dists/unstable/main/source/Sources Hash Sum mismatch
+ testfailureequal "W: Failed to fetch file:$APTARCHIVE/dists/unstable/main/source/Sources.gz Hash Sum mismatch
E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
testfileequal lists.before "$(listcurrentlistsdirectory)"
testfailure ls rootdir/var/lib/apt/lists/*_InRelease
- testequal "WARNING: The following packages cannot be authenticated!
+ testfailureequal "WARNING: The following packages cannot be authenticated!
old
E: There are problems and -y was used without --force-yes" aptget install -qq -y old
}
@@ -144,7 +144,7 @@ test_inrelease_to_unauth_inrelease() {
signreleasefiles 'Marvin Paranoid'
- testequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file: unstable InRelease: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY E8525D47528144E2
+ testwarningequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file:${APTARCHIVE} unstable InRelease: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY E8525D47528144E2
W: Failed to fetch file:$APTARCHIVE/dists/unstable/InRelease The following signatures couldn't be verified because the public key is not available: NO_PUBKEY E8525D47528144E2
@@ -158,6 +158,10 @@ test_inrelease_to_broken_gzip() {
msgmsg "Test InRelease to broken gzip"
start_with_good_inrelease
+ break_repository_sources_index '+1hour'
+ generatereleasefiles '+2hours'
+ signreleasefiles
+
# append junk at the end of the compressed file
echo "lala" >> $APTARCHIVE/dists/unstable/main/source/Sources.gz
touch -d '+2min' $APTARCHIVE/dists/unstable/main/source/Sources.gz
@@ -165,6 +169,7 @@ test_inrelease_to_broken_gzip() {
rm $APTARCHIVE/dists/unstable/main/source/Sources
testfailure aptget update
+ testsuccess grep 'Hash Sum mismatch' rootdir/tmp/testfailure.output
testfileequal lists.before "$(listcurrentlistsdirectory)"
}
diff --git a/test/integration/test-apt-update-stale b/test/integration/test-apt-update-stale
index 52f94591f..8a2703fd1 100755
--- a/test/integration/test-apt-update-stale
+++ b/test/integration/test-apt-update-stale
@@ -14,9 +14,11 @@ configarchitecture "i386"
insertpackage 'unstable' 'foo' 'all' '1.0'
-setupaptarchive
+setupaptarchive --no-update
changetowebserver
-aptget update -qq
+
+echo "Acquire::Languages \"none\";" > rootdir/etc/apt/apt.conf.d/00nolanguages
+testsuccess aptget update -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::http=1
listcurrentlistsdirectory > lists.before
# insert new version
@@ -24,7 +26,7 @@ mkdir aptarchive/dists/unstable/main/binary-i386/saved
cp -p aptarchive/dists/unstable/main/binary-i386/Packages* \
aptarchive/dists/unstable/main/binary-i386/saved
insertpackage 'unstable' 'foo' 'all' '2.0'
-
+touch -d '+1 hour' aptarchive/dists/unstable/main/binary-i386/Packages
compressfile aptarchive/dists/unstable/main/binary-i386/Packages
# ensure that we do not get a I-M-S hit for the Release file
@@ -37,7 +39,6 @@ cp -p aptarchive/dists/unstable/main/binary-i386/saved/Packages* \
aptarchive/dists/unstable/main/binary-i386/
# ensure this raises an error
-testequal "W: Failed to fetch http://localhost:8080/dists/unstable/main/binary-i386/Packages Hash Sum mismatch
-
-E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
+testfailuremsg "W: Failed to fetch copy:$(readlink -f ./rootdir)/var/lib/apt/lists/localhost:8080_dists_unstable_main_binary-i386_Packages Hash Sum mismatch
+E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::http=1
testfileequal lists.before "$(listcurrentlistsdirectory)"
diff --git a/test/integration/test-apt-update-transactions b/test/integration/test-apt-update-transactions
index fe352c762..a5dac1737 100755
--- a/test/integration/test-apt-update-transactions
+++ b/test/integration/test-apt-update-transactions
@@ -8,6 +8,7 @@ TESTDIR=$(readlink -f $(dirname $0))
setupenvironment
configarchitecture 'i386'
+configcompression '.' 'gz'
insertpackage 'unstable' 'foo' 'all' '1.0'
insertsource 'unstable' 'foo' 'all' '1.0'
@@ -15,7 +16,8 @@ insertsource 'unstable' 'foo' 'all' '1.0'
setupaptarchive --no-update
breakfile() {
- mv "$1" "${1}.bak"
+ mv "${1}" "${1}.bak"
+ mv "${1}.gz" "${1}.gz.bak"
cat > "$1" <<EOF
Package: bar
EOF
@@ -23,9 +25,16 @@ EOF
}
restorefile() {
mv "${1}.bak" "$1"
+ mv "${1}.gz.bak" "${1}.gz"
}
testrun() {
+ rm -rf aptarchive/dists.good
+ cp -a aptarchive/dists aptarchive/dists.good
+ insertpackage 'unstable' 'bar' 'all' '1.0'
+ insertsource 'unstable' 'bar' 'all' '1.0'
+ buildaptarchivefromfiles '+1 hour'
+
# produce an unsigned repository
find aptarchive \( -name 'Release.gpg' -o -name 'InRelease' \) -delete
testfailure aptget update --no-allow-insecure-repositories
@@ -34,34 +43,48 @@ testrun() {
# signed but broken
signreleasefiles
+ onehashbroken() {
+ testfailure aptget update
+ # each file generates two messages with this string
+ testequal '2' grep --count 'Hash Sum mismatch' rootdir/tmp/testfailure.output
+ testfileequal "$1" "$(listcurrentlistsdirectory)"
+ }
+
breakfile aptarchive/dists/unstable/main/binary-i386/Packages
- testfailure aptget update
- testfileequal "$1" "$(listcurrentlistsdirectory)"
+ onehashbroken "$1"
restorefile aptarchive/dists/unstable/main/binary-i386/Packages
breakfile aptarchive/dists/unstable/main/source/Sources
- testfailure aptget update
- testfileequal "$1" "$(listcurrentlistsdirectory)"
+ onehashbroken "$1"
restorefile aptarchive/dists/unstable/main/source/Sources
+
+ rm -rf aptarchive/dists
+ cp -a aptarchive/dists.good aptarchive/dists
}
testsetup() {
msgmsg 'Test with no initial data over' "$1"
rm -rf rootdir/var/lib/apt/lists
- mkdir -m 700 -p rootdir/var/lib/apt/lists/partial
- if [ "$(id -u)" = '0' ]; then
- chown _apt:root rootdir/var/lib/apt/lists/partial
- fi
+ mkdir -p rootdir/var/lib/apt/lists/partial
listcurrentlistsdirectory > listsdir.lst
testrun 'listsdir.lst'
msgmsg 'Test with initial data over' "$1"
- testsuccess aptget update
+ rm -rf rootdir/var/lib/apt/lists
+ testsuccess aptget update -o Debug::pkgAcquire::Worker=1
listcurrentlistsdirectory > listsdir.lst
testrun 'listsdir.lst'
}
testsetup 'file'
+
changetowebserver
+webserverconfig 'aptwebserver::support::modified-since' 'false' "$1"
+webserverconfig 'aptwebserver::support::last-modified' 'false' "$1" # curl is clever and sees hits here also
+webserverconfig 'aptwebserver::support::range' 'false' "$1"
+
testsetup 'http'
+changetohttpswebserver
+
+testsetup 'https'
diff --git a/test/integration/test-architecture-specification-parsing b/test/integration/test-architecture-specification-parsing
index d1f6011de..f5a5b123e 100755
--- a/test/integration/test-architecture-specification-parsing
+++ b/test/integration/test-architecture-specification-parsing
@@ -26,7 +26,7 @@ insertinstalledpackage 'build-essential' 'all' '11.5' 'Multi-Arch: foreign'
setupaptarchive
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
The following extra packages will be installed:
foo
@@ -38,7 +38,7 @@ Inst pkg-arch-foo (1.0 stable [${NATIVE}])
Conf foo (1.0 stable [${NATIVE}])
Conf pkg-arch-foo (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
pkg-arch-no-foo
@@ -46,7 +46,7 @@ The following NEW packages will be installed:
Inst pkg-arch-no-foo (1.0 stable [${NATIVE}])
Conf pkg-arch-no-foo (1.0 stable [${NATIVE}])" aptget install pkg-arch-no-foo -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
The following extra packages will be installed:
foo
@@ -58,7 +58,7 @@ Inst pkg-arch-foo-unrelated-no (1.0 stable [${NATIVE}])
Conf foo (1.0 stable [${NATIVE}])
Conf pkg-arch-foo-unrelated-no (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo-unrelated-no -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
The following extra packages will be installed:
foo
@@ -70,7 +70,7 @@ Inst pkg-arch-foo-unrelated-no2 (1.0 stable [${NATIVE}])
Conf foo (1.0 stable [${NATIVE}])
Conf pkg-arch-foo-unrelated-no2 (1.0 stable [${NATIVE}])" aptget install pkg-arch-foo-unrelated-no2 -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo
@@ -78,11 +78,11 @@ The following NEW packages will be installed:
Inst foo (1.0 stable [${NATIVE}])
Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep pkg-arch-no-foo -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo
@@ -90,7 +90,7 @@ The following NEW packages will be installed:
Inst foo (1.0 stable [${NATIVE}])
Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo-unrelated-no -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo
@@ -98,13 +98,13 @@ The following NEW packages will be installed:
Inst foo (1.0 stable [${NATIVE}])
Conf foo (1.0 stable [${NATIVE}])" aptget build-dep pkg-arch-foo-unrelated-no2 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget build-dep no-depends -s
# this is not really testing APT - more that dpkg is in line with us
configarchitecture 'amd64' 'armel'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
no-depends:armel
diff --git a/test/integration/test-authentication-basic b/test/integration/test-authentication-basic
index 21b024970..3a6897b59 100755
--- a/test/integration/test-authentication-basic
+++ b/test/integration/test-authentication-basic
@@ -24,7 +24,7 @@ testauthfailure() {
testauthsuccess() {
testsuccess apthelper download-file "${1}/bash" ./downloaded/bash
testfileequal ./downloaded/bash "$(cat aptarchive/bash)"
- testfilestats ./downloaded/bash '%U:%G:%a' '=' "${USER}:${USER}:644"
+ testfilestats ./downloaded/bash '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:644"
rm -f ./downloaded/bash
# lets see if got/retains acceptable permissions
@@ -32,13 +32,13 @@ testauthsuccess() {
if [ "$(id -u)" = '0' ]; then
testfilestats "$AUTHCONF" '%U:%G:%a' '=' "_apt:root:600"
else
- testfilestats "$AUTHCONF" '%U:%G:%a' '=' "${USER}:${USER}:600"
+ testfilestats "$AUTHCONF" '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:600"
fi
fi
rm -rf rootdir/var/lib/apt/lists
testsuccess aptget update
- testequal 'Reading package lists...
+ testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo
diff --git a/test/integration/test-bug-470115-new-and-tighten-recommends b/test/integration/test-bug-470115-new-and-tighten-recommends
index 6bc22ea7b..0970e2f23 100755
--- a/test/integration/test-bug-470115-new-and-tighten-recommends
+++ b/test/integration/test-bug-470115-new-and-tighten-recommends
@@ -47,7 +47,7 @@ insertpackage 'unstable' 'now-satisfiable' 'all' '2' 'Recommends: cool (>= 2)'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
cool
@@ -59,7 +59,7 @@ Inst tighten-cool [1] (2 unstable [all])
Conf cool (2 unstable [all])
Conf tighten-cool (2 unstable [all])' aptget install tighten-cool -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
stuff
@@ -71,7 +71,7 @@ Inst tighten-coolorstuff [1] (2 unstable [all])
Conf stuff (2 unstable [all])
Conf tighten-coolorstuff (2 unstable [all])' aptget install tighten-coolorstuff -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
cool
@@ -83,7 +83,7 @@ Inst tighten-coolorstuff2 [1] (2 unstable [all])
Conf cool (2 unstable [all])
Conf tighten-coolorstuff2 (2 unstable [all])' aptget install tighten-coolorstuff2 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
cool
@@ -95,7 +95,7 @@ Inst newrec-cool [1] (2 unstable [all])
Conf cool (2 unstable [all])
Conf newrec-cool (2 unstable [all])' aptget install newrec-cool -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
super
@@ -109,7 +109,7 @@ Inst super (2 unstable [all])
Conf newrec-super (2 unstable [all])
Conf super (2 unstable [all])' aptget install newrec-super -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
cool
@@ -121,7 +121,7 @@ Inst newrec-coolorstuff [1] (2 unstable [all])
Conf cool (2 unstable [all])
Conf newrec-coolorstuff (2 unstable [all])' aptget install newrec-coolorstuff -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
stuff
@@ -133,7 +133,7 @@ Inst stuff [1] (2 unstable [all])
Conf cool-gone (2 unstable [all])
Conf stuff (2 unstable [all])' aptget install cool-gone -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
super
@@ -149,7 +149,7 @@ Conf super-overtake (2 unstable [all])' aptget install super-overtake -s
# if super would be in front, we would get a new here as it is new and
# the first option in an or-group should be the preferred one…
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
cool
@@ -163,7 +163,7 @@ Conf upgrade-over-new (2 unstable [all])' aptget install upgrade-over-new -s
# the recommends wasn't used before so while we could do it now,
# the user doesn't seem to need it so avoid upgrading it
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following packages will be upgraded:
now-satisfiable
diff --git a/test/integration/test-bug-507998-dist-upgrade-recommends b/test/integration/test-bug-507998-dist-upgrade-recommends
index f3b4e04fb..70c6fb496 100755
--- a/test/integration/test-bug-507998-dist-upgrade-recommends
+++ b/test/integration/test-bug-507998-dist-upgrade-recommends
@@ -14,7 +14,7 @@ insertpackage 'unstable' 'wireshark' 'amd64' '1.2.1-2' 'Depends: wireshark-commo
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
diff --git a/test/integration/test-bug-543966-downgrade-below-1000-pin b/test/integration/test-bug-543966-downgrade-below-1000-pin
index f602bea95..180393867 100755
--- a/test/integration/test-bug-543966-downgrade-below-1000-pin
+++ b/test/integration/test-bug-543966-downgrade-below-1000-pin
@@ -13,9 +13,9 @@ insertinstalledpackage 'base-files' 'all' '5.0.0-1'
setupaptarchive
STATUS=$(readlink -f rootdir/var/lib/dpkg/status)
-APTARCHIVE="$(readlink -f aptarchive)/"
+APTARCHIVE="$(readlink -f aptarchive)"
-testequal "base-files:
+testsuccessequal "base-files:
Installed: 5.0.0-1
Candidate: 5.0.0-1
Version table:
@@ -24,58 +24,70 @@ testequal "base-files:
5.0.0 0
500 file:${APTARCHIVE} unstable/main i386 Packages" aptcache policy base-files -o apt::pin=0
-echo 'Package: base-files
+writepin() {
+ echo "Package: $1
Pin: release a=unstable
-Pin-Priority: 99' > rootdir/etc/apt/preferences
+Pin-Priority: $2" > rootdir/etc/apt/preferences
+}
-testequal "base-files:
+
+
+testpinning() {
+ local PKGPIN=''
+ local PKGPINPRIO='0'
+ local REPPINPRIO=''
+ if [ "$1" != '*' ]; then
+ PKGPINPRIO=''
+ REPPINPRIO=' 500'
+ PKGPIN='Package pin: 5.0.0
+ '
+ fi
+ writepin "$1" '99'
+ testsuccessequal "base-files:
Installed: 5.0.0-1
Candidate: 5.0.0-1
- Package pin: 5.0.0
- Version table:
- *** 5.0.0-1 99
+ ${PKGPIN}Version table:
+ *** 5.0.0-1 ${PKGPINPRIO:-99}
100 $STATUS
- 5.0.0 99
- 500 file:${APTARCHIVE} unstable/main i386 Packages" aptcache policy base-files -o apt::pin=99
+ 5.0.0 ${PKGPINPRIO:-99}
+ ${REPPINPRIO:- 99} file:${APTARCHIVE} unstable/main i386 Packages" aptcache policy base-files -o apt::pin=99
-echo 'Package: base-files
-Pin: release a=unstable
-Pin-Priority: 100' > rootdir/etc/apt/preferences
-
-testequal "base-files:
+ writepin "$1" '100'
+ testsuccessequal "base-files:
Installed: 5.0.0-1
Candidate: 5.0.0-1
- Package pin: 5.0.0
- Version table:
- *** 5.0.0-1 100
+ ${PKGPIN}Version table:
+ *** 5.0.0-1 ${PKGPINPRIO:-100}
100 $STATUS
- 5.0.0 100
- 500 file:${APTARCHIVE} unstable/main i386 Packages" aptcache policy base-files -o apt::pin=100
+ 5.0.0 ${PKGPINPRIO:-100}
+ ${REPPINPRIO:- 100} file:${APTARCHIVE} unstable/main i386 Packages" aptcache policy base-files -o apt::pin=100
-echo 'Package: base-files
-Pin: release a=unstable
-Pin-Priority: 999' > rootdir/etc/apt/preferences
-
-testequal "base-files:
+ writepin "$1" '999'
+ testsuccessequal "base-files:
Installed: 5.0.0-1
Candidate: 5.0.0-1
- Package pin: 5.0.0
- Version table:
- *** 5.0.0-1 999
+ ${PKGPIN}Version table:
+ *** 5.0.0-1 ${PKGPINPRIO:-999}
100 $STATUS
- 5.0.0 999
- 500 file:${APTARCHIVE} unstable/main i386 Packages" aptcache policy base-files -o apt::pin=999
-
-echo 'Package: base-files
-Pin: release a=unstable
-Pin-Priority: 1000' > rootdir/etc/apt/preferences
+ 5.0.0 ${PKGPINPRIO:-999}
+ ${REPPINPRIO:- 999} file:${APTARCHIVE} unstable/main i386 Packages" aptcache policy base-files -o apt::pin=999
-testequal "base-files:
+ writepin "$1" '1000'
+ testsuccessequal "base-files:
Installed: 5.0.0-1
Candidate: 5.0.0
- Package pin: 5.0.0
- Version table:
- *** 5.0.0-1 1000
+ ${PKGPIN}Version table:
+ *** 5.0.0-1 ${PKGPINPRIO:-1000}
100 $STATUS
- 5.0.0 1000
- 500 file:${APTARCHIVE} unstable/main i386 Packages" aptcache policy base-files -o apt::pin=1000
+ 5.0.0 ${PKGPINPRIO:-1000}
+ ${REPPINPRIO:-1000} file:${APTARCHIVE} unstable/main i386 Packages" aptcache policy base-files -o apt::pin=1000
+}
+
+msgmsg 'Tests with generic-form pin'
+testpinning '*'
+msgmsg 'Tests with specific-form pin'
+testpinning 'base-files'
+msgmsg 'Tests with specific-form pin with glob'
+testpinning 'base-fil*'
+msgmsg 'Tests with specific-form pin with regex'
+testpinning '/^base-f[iI]les$/'
diff --git a/test/integration/test-bug-549968-install-depends-of-not-installed b/test/integration/test-bug-549968-install-depends-of-not-installed
index 8c434b3ce..3ff4807de 100755
--- a/test/integration/test-bug-549968-install-depends-of-not-installed
+++ b/test/integration/test-bug-549968-install-depends-of-not-installed
@@ -14,7 +14,7 @@ setupaptarchive
# We check the Markers here as the autoremove nuker will also
# prevent it, but to late - its better to fail earlier
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
MarkInstall coolstuff [ i386 ] < none -> 1.0 > ( other ) FU=1
Ignore MarkInstall of extracoolstuff [ i386 ] < none -> 1.0 > ( other ) as its mode (Keep) is protected
diff --git a/test/integration/test-bug-590041-prefer-non-virtual-packages b/test/integration/test-bug-590041-prefer-non-virtual-packages
index 0ce4c1413..3bd7d436e 100755
--- a/test/integration/test-bug-590041-prefer-non-virtual-packages
+++ b/test/integration/test-bug-590041-prefer-non-virtual-packages
@@ -46,8 +46,8 @@ EOF
setupaptarchive
testshowvirtual libc6:i386
-testequal "$pkglibc6" aptcache show libc6:armel
-testequal "$pkglibc6" aptcache show libc6
-testequal "$pkglibdb1" aptcache show libdb1:i386
+testsuccessequal "$pkglibc6" aptcache show libc6:armel
+testsuccessequal "$pkglibc6" aptcache show libc6
+testsuccessequal "$pkglibdb1" aptcache show libdb1:i386
testnopackage libdb1:armel
-testequal "$pkglibdb1" aptcache show libdb1
+testsuccessequal "$pkglibdb1" aptcache show libdb1
diff --git a/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order b/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order
index 645e86d7d..37426ec11 100755
--- a/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order
+++ b/test/integration/test-bug-590438-broken-provides-thanks-to-remove-order
@@ -29,7 +29,7 @@ predependsgawk() {
echo "$pkgbasefile
Pre-Depends: $1
" >> rootdir/var/lib/dpkg/status
- testequal "Inst gawk (1:3.1.7.dfsg-5 localhost [i386])
+ testsuccessequal "Inst gawk (1:3.1.7.dfsg-5 localhost [i386])
Conf gawk (1:3.1.7.dfsg-5 localhost [i386])
Remv mawk [1.3.3-15]" aptget install gawk mawk- -sqq -o PreDepends=$(echo "$1" | sed 's/ //g')
}
diff --git a/test/integration/test-bug-591882-conkeror b/test/integration/test-bug-591882-conkeror
index 891ddb8b7..b71d4d5fd 100755
--- a/test/integration/test-bug-591882-conkeror
+++ b/test/integration/test-bug-591882-conkeror
@@ -73,5 +73,5 @@ After this operation, 36.0 MB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation."
# Test that the old behavior can be restored with the option
-testequal "$UPGRADEFAIL" aptget dist-upgrade --trivial-only -o pkgProblemResolver::FixByInstall=0
-testequal "$UPGRADESUCCESS" aptget dist-upgrade --trivial-only #-o pkgProblemResolver::FixByInstall=0
+testfailureequal "$UPGRADEFAIL" aptget dist-upgrade --trivial-only -o pkgProblemResolver::FixByInstall=0
+testfailureequal "$UPGRADESUCCESS" aptget dist-upgrade --trivial-only #-o pkgProblemResolver::FixByInstall=0
diff --git a/test/integration/test-bug-593360-modifiers-in-names b/test/integration/test-bug-593360-modifiers-in-names
index 74826cbdb..57a24683e 100755
--- a/test/integration/test-bug-593360-modifiers-in-names
+++ b/test/integration/test-bug-593360-modifiers-in-names
@@ -7,7 +7,7 @@ setupenvironment
configarchitecture "i386"
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
g++
@@ -15,12 +15,12 @@ The following NEW packages will be installed:
Inst g++ (4:4.4.5-1 localhost [i386])
Conf g++ (4:4.4.5-1 localhost [i386])' aptget install g++ -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Package 'g++' is not installed, so not removed
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget remove g++ -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
g++
@@ -28,7 +28,7 @@ The following NEW packages will be installed:
Inst g++ (4:4.4.5-1 localhost [i386])
Conf g++ (4:4.4.5-1 localhost [i386])' aptget install g+++ -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
g++
@@ -36,7 +36,7 @@ The following NEW packages will be installed:
Inst g++ (4:4.4.5-1 localhost [i386])
Conf g++ (4:4.4.5-1 localhost [i386])' aptget purge g+++ -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
apt
@@ -44,7 +44,7 @@ The following NEW packages will be installed:
Inst apt (0.8.8 localhost [all])
Conf apt (0.8.8 localhost [all])' aptget install apt -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
apt+
@@ -52,7 +52,7 @@ The following NEW packages will be installed:
Inst apt+ (0.8.8 localhost [all])
Conf apt+ (0.8.8 localhost [all])' aptget install apt+ -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
apt+
@@ -60,7 +60,7 @@ The following NEW packages will be installed:
Inst apt+ (0.8.8 localhost [all])
Conf apt+ (0.8.8 localhost [all])' aptget install apt++ -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
apt+
diff --git a/test/integration/test-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files
index bca07268c..47dd62712 100755
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -12,8 +12,8 @@ setupflataptarchive
testaptgetupdate() {
rm -rf rootdir/var/lib/apt
- aptget update 2>> testaptgetupdate.diff >> testaptgetupdate.diff || true
- sed -i -e '/Ign /,+1d' -e '/Release/ d' -e 's#Get:[0-9]\+ #Get: #' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
+ aptget update >testaptgetupdate.diff 2>&1 || true
+ sed -i -e '/Ign /,+1d' -e '/Release/ d' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
GIVEN="$1"
shift
msgtest "Test for correctness of" "apt-get update with $*"
@@ -27,9 +27,6 @@ testaptgetupdate() {
createemptyarchive() {
find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete
- if [ "en" = "$1" ]; then
- echo -n "" | $COMPRESSOR_CMD > aptarchive/Packages.$COMPRESS
- fi
touch aptarchive/Packages
echo -n "" | $COMPRESSOR_CMD > aptarchive/${1}.$COMPRESS
generatereleasefiles
@@ -39,9 +36,6 @@ createemptyarchive() {
createemptyfile() {
find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete
- if [ "en" = "$1" ]; then
- echo -n "" | $COMPRESSOR_CMD > aptarchive/Packages.$COMPRESS
- fi
touch aptarchive/Packages aptarchive/${1}.$COMPRESS
generatereleasefiles
signreleasefiles
@@ -49,23 +43,18 @@ createemptyfile() {
}
testoverfile() {
+ local APTARCHIVE="$(readlink -f ./aptarchive)"
forcecompressor "$1"
- createemptyfile 'en'
- testaptgetupdate 'Reading package lists...' "empty file en.$COMPRESS over file"
-
- createemptyarchive 'en'
- testaptgetupdate 'Reading package lists...' "empty archive en.$COMPRESS over file"
-
createemptyarchive 'Packages'
- # FIXME: Why omits the file transport the Packages Get line?
- #Get:3 file: Packages []
- testaptgetupdate 'Reading package lists...' "empty archive Packages.$COMPRESS over file"
+ testaptgetupdate "Get:2 file:$APTARCHIVE Packages []
+Reading package lists..." "empty archive Packages.$COMPRESS over file"
createemptyfile 'Packages'
- testaptgetupdate "Err file: Packages
+ testaptgetupdate "Get:2 file:$APTARCHIVE Packages
+Err:2 file:$APTARCHIVE Packages
Empty files can't be valid archives
-W: Failed to fetch ${COMPRESSOR}:$(readlink -f aptarchive/Packages.$COMPRESS) Empty files can't be valid archives
+W: Failed to fetch ${COMPRESSOR}:${APTARCHIVE}/Packages.$COMPRESS Empty files can't be valid archives
E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file"
}
@@ -74,13 +63,13 @@ testoverhttp() {
forcecompressor "$1"
createemptyarchive 'Packages'
- testaptgetupdate "Get: http://localhost:8080 Packages []
+ testaptgetupdate "Get:2 http://localhost:8080 Packages []
Reading package lists..." "empty archive Packages.$COMPRESS over http"
createemptyfile 'Packages'
#FIXME: we should response with a good error message instead
- testaptgetupdate "Get: http://localhost:8080 Packages
-Err http://localhost:8080 Packages
+ testaptgetupdate "Get:2 http://localhost:8080 Packages
+Err:2 http://localhost:8080 Packages
Empty files can't be valid archives
W: Failed to fetch ${COMPRESSOR}:$(readlink -f rootdir/var/lib/apt/lists/partial/localhost:8080_Packages.${COMPRESS}) Empty files can't be valid archives
diff --git a/test/integration/test-bug-596498-trusted-unsigned-repo b/test/integration/test-bug-596498-trusted-unsigned-repo
index 1e5e75b0e..1ff0f1d8d 100755
--- a/test/integration/test-bug-596498-trusted-unsigned-repo
+++ b/test/integration/test-bug-596498-trusted-unsigned-repo
@@ -15,19 +15,23 @@ aptgetupdate() {
${1:-testwarning} aptget update --allow-insecure-repositories
}
-PKGTEXT="$(aptget install cool --assume-no -d | head -n 7)"
+PKGTEXT="$(aptget install cool --assume-no -d | head -n 8)"
+DOWNLOG="$(echo "$PKGTEXT" | tail -n 1)"
+PKGTEXT="$(echo "$PKGTEXT" | head -n 7)"
DEBFILE='rootdir/etc/apt/sources.list.d/apt-test-unstable-deb.list'
-testequal "$PKGTEXT
+testsuccessequal "$PKGTEXT
+$DOWNLOG
Download complete and in download only mode" aptget install cool --assume-no -d
-testequal "$PKGTEXT
+testsuccessequal "$PKGTEXT
+$DOWNLOG
Download complete and in download only mode" aptget install cool --assume-no -d --allow-unauthenticated
sed -i -e 's#deb#deb [trusted=no]#' $DEBFILE
aptgetupdate 'testsuccess'
-testequal "$PKGTEXT
+testfailureequal "$PKGTEXT
WARNING: The following packages cannot be authenticated!
cool
Install these packages without verification? [y/N] N
@@ -37,20 +41,22 @@ find aptarchive/ \( -name 'Release.gpg' -o -name 'InRelease' \) -delete
sed -i -e 's#deb \[trusted=no\]#deb#' $DEBFILE
aptgetupdate
-testequal "$PKGTEXT
+testfailureequal "$PKGTEXT
WARNING: The following packages cannot be authenticated!
cool
Install these packages without verification? [y/N] N
E: Some packages could not be authenticated" aptget install cool --assume-no -d
-testequal "$PKGTEXT
+testsuccessequal "$PKGTEXT
WARNING: The following packages cannot be authenticated!
cool
Authentication warning overridden.
+$DOWNLOG
Download complete and in download only mode" aptget install cool --assume-no -d --allow-unauthenticated
sed -i -e 's#deb#deb [trusted=yes]#' $DEBFILE
aptgetupdate
-testequal "$PKGTEXT
+testsuccessequal "$PKGTEXT
+$DOWNLOG
Download complete and in download only mode" aptget install cool --assume-no -d
diff --git a/test/integration/test-bug-598669-install-postfix-gets-exim-heavy b/test/integration/test-bug-598669-install-postfix-gets-exim-heavy
index c3a77f346..2ec1d3d1c 100755
--- a/test/integration/test-bug-598669-install-postfix-gets-exim-heavy
+++ b/test/integration/test-bug-598669-install-postfix-gets-exim-heavy
@@ -7,7 +7,7 @@ setupenvironment
configarchitecture "i386"
setupaptarchive
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
exim4 exim4-daemon-light
diff --git a/test/integration/test-bug-601961-install-info b/test/integration/test-bug-601961-install-info
index 914910597..806d3f547 100755
--- a/test/integration/test-bug-601961-install-info
+++ b/test/integration/test-bug-601961-install-info
@@ -7,7 +7,7 @@ setupenvironment
configarchitecture "i386"
setupaptarchive
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
findutils
@@ -18,7 +18,7 @@ This should NOT be done unless you know exactly what you are doing!
After this operation, 1745 kB disk space will be freed.
E: Trivial Only specified but this is not a trivial operation.' aptget remove findutils --trivial-only
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
install-info
@@ -26,7 +26,7 @@ The following packages will be REMOVED:
After this operation, 262 kB disk space will be freed.
E: Trivial Only specified but this is not a trivial operation.' aptget remove install-info --trivial-only
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
essentialpkg findutils
diff --git a/test/integration/test-bug-602412-dequote-redirect b/test/integration/test-bug-602412-dequote-redirect
index 6393f0c27..b9d232f90 100755
--- a/test/integration/test-bug-602412-dequote-redirect
+++ b/test/integration/test-bug-602412-dequote-redirect
@@ -8,7 +8,7 @@ configarchitecture 'amd64'
buildsimplenativepackage 'unrelated' 'all' '0.5~squeeze1' 'unstable'
-setupaptarchive
+setupaptarchive --no-update
changetowebserver -o aptwebserver::redirect::replace::/pool/=/newpool/ \
-o aptwebserver::redirect::replace::/dists/=/newdists/
@@ -16,14 +16,12 @@ mv aptarchive/pool aptarchive/newpool
mv aptarchive/dists aptarchive/newdists
testrun() {
+ msgmsg 'Test redirection works in method boundaries' "$1"
msgtest 'Test redirection works in' 'apt-get update'
testsuccess --nomsg aptget update
# check that I-M-S header is kept in redirections
- testequal "Hit $1 unstable InRelease
-Hit $1 unstable/main Sources
-Hit $1 unstable/main amd64 Packages
-Hit $1 unstable/main Translation-en
+ testsuccessequal "Hit:1 $1 unstable InRelease
Reading package lists..." aptget update
msgtest 'Test redirection works in' 'package download'
diff --git a/test/integration/test-bug-604222-new-and-autoremove b/test/integration/test-bug-604222-new-and-autoremove
index b29347f64..52992680b 100755
--- a/test/integration/test-bug-604222-new-and-autoremove
+++ b/test/integration/test-bug-604222-new-and-autoremove
@@ -11,7 +11,7 @@ touch rootdir/var/lib/apt/extended_states
testsuccess aptmark markauto 'libvtk5.4'
testmarkedauto 'libvtk5.4'
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Reading state information...
The following package was automatically installed and is no longer required:
@@ -23,7 +23,7 @@ The following NEW packages will be installed:
Inst libavcodec52 (4:0.5.2-6 localhost [i386])
Conf libavcodec52 (4:0.5.2-6 localhost [i386])" aptget install libavcodec52 -s
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Reading state information...
The following package was automatically installed and is no longer required:
@@ -61,6 +61,6 @@ Need to get 0 B/6304 kB of archives.
After this operation, 17.3 MB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation.'
-testequal "$CONFLICTING" aptget install dummy-archive --trivial-only -o Debug::pkgDepCache::Marker=1 -o APT::Get::HideAutoRemove=0
-testequal "$CONFLICTING" aptget install dummy-archive --trivial-only -o Debug::pkgDepCache::Marker=1 -o APT::Get::HideAutoRemove=1
-testequal "$CONFLICTING" aptget install dummy-archive --trivial-only -o Debug::pkgDepCache::Marker=1 -o APT::Get::HideAutoRemove=small
+testfailureequal "$CONFLICTING" aptget install dummy-archive --trivial-only -o Debug::pkgDepCache::Marker=1 -o APT::Get::HideAutoRemove=0
+testfailureequal "$CONFLICTING" aptget install dummy-archive --trivial-only -o Debug::pkgDepCache::Marker=1 -o APT::Get::HideAutoRemove=1
+testfailureequal "$CONFLICTING" aptget install dummy-archive --trivial-only -o Debug::pkgDepCache::Marker=1 -o APT::Get::HideAutoRemove=small
diff --git a/test/integration/test-bug-605394-versioned-or-groups b/test/integration/test-bug-605394-versioned-or-groups
index bb72d59e3..f938ba311 100755
--- a/test/integration/test-bug-605394-versioned-or-groups
+++ b/test/integration/test-bug-605394-versioned-or-groups
@@ -7,7 +7,7 @@ setupenvironment
configarchitecture "i386"
setupaptarchive
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
diff --git a/test/integration/test-bug-611729-mark-as-manual b/test/integration/test-bug-611729-mark-as-manual
index e3d454f97..a7bde393b 100755
--- a/test/integration/test-bug-611729-mark-as-manual
+++ b/test/integration/test-bug-611729-mark-as-manual
@@ -34,14 +34,14 @@ testdpkgnotinstalled a
testdpkginstalled b c
testmarkedauto 'b'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
b is already the newest version.
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b --only-upgrade
testmarkedauto 'b'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
b is already the newest version.
@@ -59,7 +59,7 @@ sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date:
testfileequal 'rootdir/var/log/apt/history.log' '
Reinstall: b:i386 (1.0)'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
b is already the newest version.
diff --git a/test/integration/test-bug-612099-multiarch-conflicts b/test/integration/test-bug-612099-multiarch-conflicts
index c32600037..401b521a5 100755
--- a/test/integration/test-bug-612099-multiarch-conflicts
+++ b/test/integration/test-bug-612099-multiarch-conflicts
@@ -17,7 +17,7 @@ setupaptarchive
testsuccess aptget install libc6:i386 -t stable -y
testdpkginstalled libc6:i386
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following packages will be REMOVED:
@@ -29,7 +29,7 @@ Remv libc6 [1.0]
Inst libc6:amd64 (1.0 stable [amd64])
Conf libc6:amd64 (1.0 stable [amd64])' aptget install libc6:amd64 -s -t stable
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following NEW packages will be installed:
@@ -38,7 +38,7 @@ The following NEW packages will be installed:
Inst foobar (1.0 stable [i386])
Conf foobar (1.0 stable [i386])' aptget install foobar -st stable
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following extra packages will be installed:
@@ -54,7 +54,7 @@ Inst foobar:amd64 (1.0 stable [amd64])
Conf libc6:amd64 (1.0 stable [amd64])
Conf foobar:amd64 (1.0 stable [amd64])' aptget install foobar:amd64 -st stable
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following NEW packages will be installed:
@@ -67,7 +67,7 @@ Inst foobar (1.0 stable [i386])
Conf libc6 (2.0 testing [all])
Conf foobar (1.0 stable [i386])' aptget install foobar/stable libc6 -st testing
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
Calculating upgrade...
@@ -84,7 +84,7 @@ testsuccess aptget purge libc6 -y
testsuccess aptget install libc6:i386 -y
testdpkginstalled libc6:all
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following NEW packages will be installed:
@@ -93,7 +93,7 @@ The following NEW packages will be installed:
Inst foobar (1.0 stable [i386])
Conf foobar (1.0 stable [i386])' aptget install foobar/stable -st testing
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following extra packages will be installed:
@@ -110,7 +110,7 @@ Conf libc6:amd64 (1.0 stable [amd64])
Conf foobar:amd64 (1.0 stable [amd64])' aptget install foobar:amd64/stable -st testing
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Reading state information...
Selected version '1.0' (stable [i386]) for 'libc6'
@@ -133,7 +133,7 @@ setupaptarchive
testsuccess aptget install libc6-same:i386 -t stable -y
testdpkginstalled libc6-same:i386
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following NEW packages will be installed:
@@ -142,7 +142,7 @@ The following NEW packages will be installed:
Inst foobar-same (1.0 stable [i386])
Conf foobar-same (1.0 stable [i386])' aptget install foobar-same -st stable
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following extra packages will be installed:
@@ -155,7 +155,7 @@ Inst foobar-same:amd64 (1.0 stable [amd64])
Conf libc6-same:amd64 (1.0 stable [amd64])
Conf foobar-same:amd64 (1.0 stable [amd64])' aptget install foobar-same:amd64 -st stable
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following NEW packages will be installed:
@@ -166,7 +166,7 @@ Conf libc6-same:amd64 (1.0 stable [amd64])' aptget install libc6-same:amd64 -s -
# FIXME: We should test installing libc6-same:amd64 here, but dpkg doesn't allow it currently
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
Calculating upgrade...
@@ -184,7 +184,7 @@ testsuccess aptget install libc6-same:i386 -y
testdpkginstalled libc6-same:all
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Reading state information...
Selected version '1.0' (stable [i386]) for 'libc6-same'
@@ -194,7 +194,7 @@ The following packages will be DOWNGRADED:
Inst libc6-same [2.0] (1.0 stable [i386])
Conf libc6-same (1.0 stable [i386])" aptget install libc6-same/stable -s -q=0
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following NEW packages will be installed:
@@ -203,7 +203,7 @@ The following NEW packages will be installed:
Inst foobar-same (1.0 stable [i386])
Conf foobar-same (1.0 stable [i386])' aptget install foobar-same/stable -st testing
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following extra packages will be installed:
diff --git a/test/integration/test-bug-612557-garbage-upgrade b/test/integration/test-bug-612557-garbage-upgrade
index 910b3b149..552330d81 100755
--- a/test/integration/test-bug-612557-garbage-upgrade
+++ b/test/integration/test-bug-612557-garbage-upgrade
@@ -17,7 +17,7 @@ testsuccess aptmark markauto python-uno openoffice.org-common
#aptmark unmarkauto openoffice.org-emailmerge
testmarkedauto python-uno openoffice.org-common
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following extra packages will be installed:
@@ -35,7 +35,7 @@ E: Trivial Only specified but this is not a trivial operation.' aptget --trivial
testsuccess aptmark markauto openoffice.org-emailmerge
testmarkedauto python-uno openoffice.org-common openoffice.org-emailmerge
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following extra packages will be installed:
@@ -50,7 +50,7 @@ The following packages will be upgraded:
After this operation, 53.2 MB disk space will be freed.
E: Trivial Only specified but this is not a trivial operation.' aptget --trivial-only install python-uno
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following packages will be REMOVED:
diff --git a/test/integration/test-bug-613420-new-garbage-dependency b/test/integration/test-bug-613420-new-garbage-dependency
index 9d9f1096a..5839f8798 100755
--- a/test/integration/test-bug-613420-new-garbage-dependency
+++ b/test/integration/test-bug-613420-new-garbage-dependency
@@ -18,7 +18,7 @@ touch rootdir/var/lib/apt/extended_states
testsuccess aptmark markauto openoffice.org-officebean
testmarkedauto openoffice.org-officebean
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Reading state information...
The following packages were automatically installed and are no longer required:
diff --git a/test/integration/test-bug-618848-always-respect-user-requests b/test/integration/test-bug-618848-always-respect-user-requests
index 1ebadf280..a7ffee6c1 100755
--- a/test/integration/test-bug-618848-always-respect-user-requests
+++ b/test/integration/test-bug-618848-always-respect-user-requests
@@ -13,7 +13,7 @@ insertpackage 'unstable' 'exim4-daemon-heavy' 'all' '1.0' 'Depends: libdb4.8'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
MarkDelete libdb4.8 [ i386 ] < 1.0 > ( other ) FU=1
MarkDelete exim4-daemon-light [ i386 ] < 1.0 > ( other ) FU=0
diff --git a/test/integration/test-bug-624218-Translation-file-handling b/test/integration/test-bug-624218-Translation-file-handling
index d32bd513b..3987abff1 100755
--- a/test/integration/test-bug-624218-Translation-file-handling
+++ b/test/integration/test-bug-624218-Translation-file-handling
@@ -8,80 +8,98 @@ configarchitecture 'i386'
buildsimplenativepackage 'coolstuff' 'all' '1.0' 'unstable'
-setupaptarchive
+setupaptarchive --no-update
changetowebserver
-
rm -rf rootdir/var/lib/apt/lists
translationslisted() {
msgtest 'No download of non-existent locals' "$1"
- LC_ALL="" aptget update -o Acquire::Languages=en | grep -q -e 'Translation-[^e][^n] ' && msgfail || msgpass
+ export LC_ALL=""
+ testsuccess --nomsg aptget update -o Acquire::Languages=en
+ testfailure grep -q -e 'Translation-[^e][^n] ' rootdir/tmp/testsuccess.output
rm -rf rootdir/var/lib/apt/lists
msgtest 'Download of existent locals' "$1"
- LC_ALL="" aptget update | grep -q -e 'Translation-en ' && msgpass || msgfail
+ testsuccess --nomsg aptget update
+ cp rootdir/tmp/testsuccess.output testsuccess.output
+ testsuccess grep -q -e 'Translation-en ' testsuccess.output
rm -rf rootdir/var/lib/apt/lists
msgtest 'Download of en in LC_ALL=C' "$1"
- LC_ALL=C aptget update | grep -q -e 'Translation-en ' && msgpass || msgfail
+ export LC_ALL=C
+ testsuccess --nomsg aptget update
+ cp rootdir/tmp/testsuccess.output testsuccess.output
+ testsuccess grep -q -e 'Translation-en ' testsuccess.output
rm -rf rootdir/var/lib/apt/lists
+ unset LC_ALL
msgtest 'Download of en as forced language' "$1"
- aptget update -o Acquire::Languages=en | grep -q -e 'Translation-en ' && msgpass || msgfail
+ testsuccess --nomsg aptget update -o Acquire::Languages=en
+ cp rootdir/tmp/testsuccess.output testsuccess.output
+ testsuccess grep -q -e 'Translation-en ' testsuccess.output
rm -rf rootdir/var/lib/apt/lists
msgtest 'Download of nothing else in forced language' "$1"
- aptget update -o Acquire::Languages=en | grep -q -e 'Translation-[^e][^n] ' && msgfail || msgpass
+ testsuccess --nomsg aptget update -o Acquire::Languages=en
+ testfailure grep -q -e 'Translation-[^e][^n] ' rootdir/tmp/testsuccess.output
rm -rf rootdir/var/lib/apt/lists
msgtest 'Download no Translation- if forced language is non-existent' "$1"
- aptget update -o Acquire::Languages=ast_DE | grep -q -e 'Translation-' && msgfail || msgpass
+ testsuccess --nomsg aptget update -o Acquire::Languages=ast_DE
+ testfailure grep -q -e 'Translation-' rootdir/tmp/testsuccess.output
rm -rf rootdir/var/lib/apt/lists
msgtest 'Download of nothing if none is forced' "$1"
- aptget update -o Acquire::Languages=none | grep -q -e 'Translation' && msgfail || msgpass
+ testsuccess --nomsg aptget update -o Acquire::Languages=none
+ testfailure grep -q -e 'Translation' rootdir/tmp/testsuccess.output
rm -rf rootdir/var/lib/apt/lists
}
translationslisted 'with full Index'
-
# No Release file at all, so no records about Translation files
# (fallback to guessing)
-find aptarchive -name 'Release' -or -name 'InRelease' | xargs rm -f
+find aptarchive \( -name 'Release' -o -name 'InRelease' \) -delete
configallowinsecurerepositories "true";
msgtest 'Download of en as forced language' 'without Index'
-aptget update -o Acquire::Languages=en | grep -q -e 'Translation-en ' && msgpass || msgfail
+testwarning --nomsg aptget update -o Acquire::Languages=en
+testsuccess grep -q -e 'Translation-en ' rootdir/tmp/testwarning.output
rm -rf rootdir/var/lib/apt/lists
msgtest 'Download of nothing else in forced language' 'without Index'
-aptget update -o Acquire::Languages=en | grep -q -e 'Translation-[^e][^n] ' && msgfail || msgpass
+testwarning --nomsg aptget update -o Acquire::Languages=en
+testfailure grep -q -e 'Translation-[^e][^n] ' rootdir/tmp/testwarning.output
rm -rf rootdir/var/lib/apt/lists
msgtest 'Download of ast_DE as forced language' 'without Index'
-aptget update -o Acquire::Languages=ast_DE | grep -q -e 'Translation-ast_DE$' && msgpass || msgfail
+testwarning --nomsg aptget update -o Acquire::Languages=ast_DE
+testsuccess grep -q -e 'Translation-ast_DE$' rootdir/tmp/testwarning.output
rm -rf rootdir/var/lib/apt/lists
msgtest 'Download of nothing else in forced language' 'without Index'
-aptget update -o Acquire::Languages=ast_DE | grep -q -e 'Translation-[^a][^s]' && msgfail || msgpass
+testwarning --nomsg aptget update -o Acquire::Languages=ast_DE
+testfailure grep -q -e 'Translation-[^a][^s]' rootdir/tmp/testwarning.output
rm -rf rootdir/var/lib/apt/lists
msgtest 'Download of nothing if none is forced' 'without Index'
-aptget update -o Acquire::Languages=none | grep -q -e 'Translation' && msgfail || msgpass
+testwarning --nomsg aptget update -o Acquire::Languages=none
+testfailure grep -q -e 'Translation' rootdir/tmp/testwarning.output
rm -rf rootdir/var/lib/apt/lists
mkdir -p rootdir/var/lib/apt/lists
touch rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_i18n_Translation-ast_DE
msgtest 'Download of builtin files' 'without Index'
-aptget update | grep -q -e 'Translation-ast_DE' && msgpass || msgfail
+testwarning --nomsg aptget update
+testsuccess grep -q -e 'Translation-ast_DE' rootdir/tmp/testwarning.output
rm -rf rootdir/var/lib/apt/lists
mkdir -p rootdir/var/lib/apt/lists
touch rootdir/var/lib/apt/lists/localhost:8080_dists_unstable_main_i18n_Translation-ast_DE
msgtest 'Download of nothing (even builtin) if none is forced' 'without Index'
-aptget update -o Acquire::Languages=none | grep -q -e 'Translation' && msgfail || msgpass
+testwarning --nomsg aptget update -o Acquire::Languages=none
+testfailure grep -q -e 'Translation' rootdir/tmp/testwarning.output
rm -rf rootdir/var/lib/apt/lists
diff --git a/test/integration/test-bug-632221-cross-dependency-satisfaction b/test/integration/test-bug-632221-cross-dependency-satisfaction
index d90a103c9..563821173 100755
--- a/test/integration/test-bug-632221-cross-dependency-satisfaction
+++ b/test/integration/test-bug-632221-cross-dependency-satisfaction
@@ -35,17 +35,17 @@ insertsource 'unstable' 'source-specific-armel' 'armel' '1' 'Build-Depends: spec
setupaptarchive
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
E: Build-Depends dependency for forbidden-none can't be satisfied because amdboot:any is not allowed on 'Multi-Arch: none' packages" aptget build-dep forbidden-none -s -a armel
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
E: Build-Depends dependency for forbidden-same can't be satisfied because libc6:any is not allowed on 'Multi-Arch: same' packages" aptget build-dep forbidden-same -s -a armel
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
E: Build-Depends dependency for forbidden-foreign can't be satisfied because doxygen:any is not allowed on 'Multi-Arch: foreign' packages" aptget build-dep forbidden-foreign -s -a armel
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
libc6 specific
@@ -54,7 +54,7 @@ Inst libc6 (1.0 unstable [amd64])
Inst specific (1.0 unstable [amd64])
Conf libc6 (1.0 unstable [amd64])
Conf specific (1.0 unstable [amd64])' aptget build-dep source-specific-amd64 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
libc6 specific
@@ -64,7 +64,7 @@ Inst specific (1.0 unstable [amd64])
Conf libc6 (1.0 unstable [amd64])
Conf specific (1.0 unstable [amd64])' aptget build-dep source-specific-amd64 -s -a armel
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
libc6:armel specific:armel
@@ -73,7 +73,7 @@ Inst libc6:armel (1.0 unstable [armel])
Inst specific:armel (1.0 unstable [armel])
Conf libc6:armel (1.0 unstable [armel])
Conf specific:armel (1.0 unstable [armel])' aptget build-dep source-specific-armel -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
libc6:armel specific:armel
@@ -83,7 +83,7 @@ Inst specific:armel (1.0 unstable [armel])
Conf libc6:armel (1.0 unstable [armel])
Conf specific:armel (1.0 unstable [armel])' aptget build-dep source-specific-armel -s -a armel
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
amdboot cool doxygen foreigner libc6 libc6-dev libfwibble-dev libfwibble1
@@ -108,7 +108,7 @@ Conf libfwibble1 (1.0 unstable [amd64])
Conf libfwibble-dev (1.0 unstable [amd64])
Conf linux-stuff (1.0 unstable [amd64])' aptget build-dep apt -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
amdboot arm-stuff:armel cool doxygen foreigner libc6 libc6:armel libc6-dev
@@ -139,7 +139,7 @@ Conf libfwibble-dev:armel (1.0 unstable [armel])' aptget build-dep apt -s -a arm
configarchitecture 'armel' 'amd64'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
amdboot:amd64 arm-stuff cool doxygen foreigner libc6 libc6-dev
@@ -164,7 +164,7 @@ Conf libc6-dev (1.0 unstable [armel])
Conf libfwibble1 (1.0 unstable [armel])
Conf libfwibble-dev (1.0 unstable [armel])' aptget build-dep apt -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
amdboot:amd64 cool doxygen foreigner libc6:amd64 libc6 libc6-dev:amd64
@@ -198,7 +198,7 @@ configarchitecture 'amd64' 'armel'
insertinstalledpackage 'cool' 'amd64' '0.5'
insertinstalledpackage 'foreigner' 'armel' '0.5'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
amdboot doxygen libc6 libc6-dev libfwibble-dev libfwibble1 linux-stuff
@@ -218,7 +218,7 @@ Conf libfwibble1 (1.0 unstable [amd64])
Conf libfwibble-dev (1.0 unstable [amd64])
Conf linux-stuff (1.0 unstable [amd64])' aptget build-dep apt -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
amdboot arm-stuff:armel doxygen libc6 libc6:armel libc6-dev libc6-dev:armel
@@ -246,7 +246,7 @@ Conf libfwibble-dev:armel (1.0 unstable [armel])' aptget build-dep apt -s -a arm
configarchitecture 'armel' 'amd64'
# cool 0.5 is not M-A: allowed, so amd64 is not acceptable
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
cool:amd64
@@ -272,7 +272,7 @@ Conf libc6-dev (1.0 unstable [armel])
Conf libfwibble1 (1.0 unstable [armel])
Conf libfwibble-dev (1.0 unstable [armel])' aptget build-dep apt -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
amdboot:amd64 doxygen libc6:amd64 libc6 libc6-dev:amd64 libc6-dev
diff --git a/test/integration/test-bug-64141-install-dependencies-for-on-hold b/test/integration/test-bug-64141-install-dependencies-for-on-hold
index 9e6c223a8..ff8fa4523 100755
--- a/test/integration/test-bug-64141-install-dependencies-for-on-hold
+++ b/test/integration/test-bug-64141-install-dependencies-for-on-hold
@@ -19,7 +19,7 @@ insertpackage 'unstable' 'libdb4.8' 'native' '4.8.30-3'
setupaptarchive
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
@@ -34,7 +34,7 @@ E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgr
testsuccess aptmark hold apt
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages have been kept back:
diff --git a/test/integration/test-bug-657695-resolver-breaks-on-virtuals b/test/integration/test-bug-657695-resolver-breaks-on-virtuals
index 1b92a04fe..14c90b3b9 100755
--- a/test/integration/test-bug-657695-resolver-breaks-on-virtuals
+++ b/test/integration/test-bug-657695-resolver-breaks-on-virtuals
@@ -16,7 +16,7 @@ insertpackage 'unstable' 'xserver-xorg-core' 'amd64' '2:1.11.3-0ubuntu9' 'Breaks
setupaptarchive
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
diff --git a/test/integration/test-bug-661537-build-profiles-support b/test/integration/test-bug-661537-build-profiles-support
index 6c850fdf9..7e7a74b03 100755
--- a/test/integration/test-bug-661537-build-profiles-support
+++ b/test/integration/test-bug-661537-build-profiles-support
@@ -24,7 +24,7 @@ insertsource 'unstable' 'spec-7' 'any' '1' 'Build-Depends: foo <stage1> <!notest
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
bar
@@ -32,7 +32,7 @@ The following NEW packages will be installed:
Inst bar (1.0 unstable [all])
Conf bar (1.0 unstable [all])' aptget build-dep buildprofiles -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
bar foo
@@ -42,7 +42,7 @@ Inst foo (1.0 unstable [all])
Conf bar (1.0 unstable [all])
Conf foo (1.0 unstable [all])' aptget build-dep buildprofiles -s -o APT::Architecture=i386
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
bar
@@ -50,7 +50,7 @@ The following NEW packages will be installed:
Inst bar (1.0 unstable [all])
Conf bar (1.0 unstable [all])' aptget build-dep buildprofiles -s -o APT::Architecture=armel
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
bar
diff --git a/test/integration/test-bug-675449-essential-are-protected b/test/integration/test-bug-675449-essential-are-protected
index 2a27c62b1..f50507532 100755
--- a/test/integration/test-bug-675449-essential-are-protected
+++ b/test/integration/test-bug-675449-essential-are-protected
@@ -27,7 +27,7 @@ insertpackage 'unstable' 'pkg-depends-new' 'amd64,i386' '2' 'Essential: yes'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
pkg-native*
@@ -37,7 +37,7 @@ This should NOT be done unless you know exactly what you are doing!
0 upgraded, 0 newly installed, 1 to remove and 3 not upgraded.
Purg pkg-native [1]' aptget purge pkg-native -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
pkg-foreign:i386*
@@ -47,7 +47,7 @@ This should NOT be done unless you know exactly what you are doing!
0 upgraded, 0 newly installed, 1 to remove and 3 not upgraded.
Purg pkg-foreign:i386 [1]' aptget purge pkg-foreign:i386 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
pkg-none-native*
@@ -57,7 +57,7 @@ This should NOT be done unless you know exactly what you are doing!
0 upgraded, 0 newly installed, 1 to remove and 3 not upgraded.
Purg pkg-none-native [1]' aptget purge pkg-none-native -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
pkg-none-foreign:i386*
@@ -67,7 +67,7 @@ This should NOT be done unless you know exactly what you are doing!
0 upgraded, 0 newly installed, 1 to remove and 3 not upgraded.
Purg pkg-none-foreign:i386 [1]' aptget purge pkg-none-foreign:i386 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following NEW packages will be installed:
diff --git a/test/integration/test-bug-679371-apt-get-autoclean-multiarch b/test/integration/test-bug-679371-apt-get-autoclean-multiarch
index 3de7d69f9..a9436fa11 100755
--- a/test/integration/test-bug-679371-apt-get-autoclean-multiarch
+++ b/test/integration/test-bug-679371-apt-get-autoclean-multiarch
@@ -22,6 +22,6 @@ testsuccess aptget install pkgall pkgnative pkgforeign -y
testdpkginstalled pkgall pkgnative
testsuccess aptcache show pkgforeign/installed
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...' aptget autoclean -s
diff --git a/test/integration/test-bug-680041-apt-mark-holds-correctly b/test/integration/test-bug-680041-apt-mark-holds-correctly
index 3f40c23dc..a6fe76bc2 100755
--- a/test/integration/test-bug-680041-apt-mark-holds-correctly
+++ b/test/integration/test-bug-680041-apt-mark-holds-correctly
@@ -17,7 +17,7 @@ setupaptarchive
runtests() {
testempty aptmark showhold
- testequal 'Reading package lists...
+ testfailureequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
@@ -26,10 +26,10 @@ The following packages will be upgraded:
After this operation, 0 B of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only
- testequal 'pkgarch set on hold.' aptmark hold pkgarch
- testequal 'pkgarch' aptmark showhold
+ testsuccessequal 'pkgarch set on hold.' aptmark hold pkgarch
+ testsuccessequal 'pkgarch' aptmark showhold
- testequal 'Reading package lists...
+ testfailureequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages have been kept back:
@@ -40,10 +40,10 @@ The following packages will be upgraded:
After this operation, 0 B of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only
- testequal 'Canceled hold on pkgarch.' aptmark unhold pkgarch
+ testsuccessequal 'Canceled hold on pkgarch.' aptmark unhold pkgarch
testempty aptmark showhold
- testequal 'Reading package lists...
+ testfailureequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
@@ -52,10 +52,10 @@ The following packages will be upgraded:
After this operation, 0 B of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only
- testequal 'pkgall set on hold.' aptmark hold pkgall
- testequal 'pkgall' aptmark showhold
+ testsuccessequal 'pkgall set on hold.' aptmark hold pkgall
+ testsuccessequal 'pkgall' aptmark showhold
- testequal 'Reading package lists...
+ testfailureequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages have been kept back:
@@ -66,7 +66,7 @@ The following packages will be upgraded:
After this operation, 0 B of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation.' aptget dist-upgrade --trivial-only
- testequal 'Canceled hold on pkgall.' aptmark unhold pkgall
+ testsuccessequal 'Canceled hold on pkgall.' aptmark unhold pkgall
testempty aptmark showhold
}
# single-arch
diff --git a/test/integration/test-bug-683786-build-dep-on-virtual-packages b/test/integration/test-bug-683786-build-dep-on-virtual-packages
index 65862c572..13a0ef0c8 100755
--- a/test/integration/test-bug-683786-build-dep-on-virtual-packages
+++ b/test/integration/test-bug-683786-build-dep-on-virtual-packages
@@ -23,7 +23,7 @@ insertsource 'unstable' 'sed2' 'any' '1' 'Build-Depends: libsehurd-dev'
setupaptarchive
-testequal 'Package: po-debconf:armel
+testsuccessequal 'Package: po-debconf:armel
Versions:
Reverse Depends:
@@ -31,9 +31,9 @@ Reverse Depends:
Dependencies:
Provides:
Reverse Provides: ' aptcache showpkg po-debconf:armel
-testequal 'N: Unable to locate package texi2html' aptcache showpkg texi2html:armel -q=0
+testsuccessequal 'N: Unable to locate package texi2html' aptcache showpkg texi2html:armel -q=0
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
po-debconf
@@ -41,15 +41,15 @@ The following NEW packages will be installed:
Inst po-debconf (1 unstable [all])
Conf po-debconf (1 unstable [all])' aptget build-dep dash -s
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
E: Build-Depends dependency for dash cannot be satisfied because the package po-debconf cannot be found' aptget build-dep -aarmel dash -s
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
E: Build-Depends dependency for diffutils cannot be satisfied because the package texi2html cannot be found' aptget build-dep -aarmel diffutils -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Note, selecting 'libselinux1-dev' instead of 'libselinux-dev'
The following NEW packages will be installed:
@@ -58,11 +58,11 @@ The following NEW packages will be installed:
Inst libselinux1-dev (1 unstable [amd64])
Conf libselinux1-dev (1 unstable [amd64])" aptget build-dep sed -s
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
E: Build-Depends dependency for sed cannot be satisfied because the package libselinux-dev cannot be found' aptget build-dep -aarmel sed -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Note, selecting 'libsehurd1-dev' instead of 'libsehurd-dev'
The following NEW packages will be installed:
@@ -71,7 +71,7 @@ The following NEW packages will be installed:
Inst libsehurd1-dev (1 unstable [amd64])
Conf libsehurd1-dev (1 unstable [amd64])" aptget build-dep sed2 -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Note, selecting 'libsehurd1-dev:armel' instead of 'libsehurd-dev:armel'
The following NEW packages will be installed:
diff --git a/test/integration/test-bug-686346-package-missing-architecture b/test/integration/test-bug-686346-package-missing-architecture
index 8024f81da..d51bbabfe 100755
--- a/test/integration/test-bug-686346-package-missing-architecture
+++ b/test/integration/test-bug-686346-package-missing-architecture
@@ -15,7 +15,7 @@ insertpackage 'unstable' 'pkge' 'none' '1'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
pkgb:none
@@ -26,7 +26,7 @@ Remv pkgb:none [1]
Inst pkgc (1 unstable [amd64])
Conf pkgc (1 unstable [amd64])' aptget install pkgc -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
pkgb
@@ -51,7 +51,7 @@ testnopackage pkge:*
# do not automatically change from none-arch to whatever-arch as
# this breaks other none packages and dpkg has this ruleset as
# this difference seems so important that it has to be maintained …
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade -s
@@ -103,7 +103,7 @@ rm rootdir/var/lib/dpkg/status
insertinstalledpackage 'pkgx' 'none' '1'
insertinstalledpackage 'pkgy' 'none' '1' 'Depends: pkgz, pkgx (>= 1)'
insertinstalledpackage 'pkgz' 'none' '1'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following packages will be REMOVED:
@@ -111,7 +111,7 @@ The following packages will be REMOVED:
0 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.
Purg pkgy:none [1]
Purg pkgx:none [1]' aptget purge pkgx -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following packages will be REMOVED:
diff --git a/test/integration/test-bug-689582-100-char-long-path-names b/test/integration/test-bug-689582-100-char-long-path-names
index 1b4b172b6..58ece1d5a 100755
--- a/test/integration/test-bug-689582-100-char-long-path-names
+++ b/test/integration/test-bug-689582-100-char-long-path-names
@@ -28,7 +28,7 @@ ar cr ../testpkg.deb debian-binary control.tar.gz data.tar.gz
cd - > /dev/null
-testequal '000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102 testpkg
+testsuccessequal '000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000102 testpkg
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101 testpkg
0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100 testpkg
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000099 testpkg
diff --git a/test/integration/test-bug-691453-apt-cache-search-multi-pattern b/test/integration/test-bug-691453-apt-cache-search-multi-pattern
index 0367892fc..15586b726 100755
--- a/test/integration/test-bug-691453-apt-cache-search-multi-pattern
+++ b/test/integration/test-bug-691453-apt-cache-search-multi-pattern
@@ -21,13 +21,13 @@ foo - tool best used with bar
bar - tool best used with foo
baz - alternative tool best used with foo'
-testequal "$FOOBAR" aptcache search foo
-testequal "$FOOBAR" aptcache search bar
-testequal "$FOOBAR" aptcache search foo bar
+testsuccessequal "$FOOBAR" aptcache search foo
+testsuccessequal "$FOOBAR" aptcache search bar
+testsuccessequal "$FOOBAR" aptcache search foo bar
-testequal 'foobar - funky tool
+testsuccessequal 'foobar - funky tool
foo - tool best used with bar' aptcache search -n foo
-testequal 'foobar - funky tool
+testsuccessequal 'foobar - funky tool
bar - tool best used with foo
baz - alternative tool best used with foo' aptcache search -n bar
-testequal 'foobar - funky tool' aptcache search -n foo bar
+testsuccessequal 'foobar - funky tool' aptcache search -n foo bar
diff --git a/test/integration/test-bug-709560-set-candidate-release b/test/integration/test-bug-709560-set-candidate-release
index 48dc5c382..ab41d8f2a 100755
--- a/test/integration/test-bug-709560-set-candidate-release
+++ b/test/integration/test-bug-709560-set-candidate-release
@@ -21,7 +21,7 @@ EOF
setupaptarchive
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Selected version '2.0' (experimental [all]) for 'foo'
Selected version '2.1' (experimental [all]) for 'foo-dep' because of 'foo'
diff --git a/test/integration/test-bug-712435-missing-descriptions b/test/integration/test-bug-712435-missing-descriptions
index 7a3518745..726134326 100755
--- a/test/integration/test-bug-712435-missing-descriptions
+++ b/test/integration/test-bug-712435-missing-descriptions
@@ -81,43 +81,43 @@ Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" > aptarchive/Packages
setupaptarchive
-testequal "Package: apt-normal
+testsuccessequal "Package: apt-normal
$PACKAGESTANZA
$DESCRIPTION
Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
" aptcache show apt-normal
for variant in 'below' 'middle' 'top'; do
- testequal "Package: apt-both-$variant
+ testsuccessequal "Package: apt-both-$variant
$PACKAGESTANZA
$TRANSDESCRIPTION
Description-md5: bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
" aptcache show apt-both-$variant
done
-testequal "Package: apt-trans
+testsuccessequal "Package: apt-trans
$PACKAGESTANZA
$TRANSDESCRIPTION
Description-md5: cccccccccccccccccccccccccccccccc
" aptcache show apt-trans
-testequal "Package: apt-md5
+testsuccessequal "Package: apt-md5
$PACKAGESTANZA
Description-md5: dddddddddddddddddddddddddddddddd
" aptcache show apt-md5
-testequal "Package: apt-none
+testsuccessequal "Package: apt-none
$PACKAGESTANZA
" aptcache show apt-none
-testequal "Package: apt-intermixed
+testsuccessequal "Package: apt-intermixed
$PACKAGESTANZA
$DESCRIPTION
Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
X-Some-Flag: yes
" aptcache show apt-intermixed
-testequal "Package: apt-intermixed2
+testsuccessequal "Package: apt-intermixed2
$PACKAGESTANZA
$TRANSDESCRIPTION
Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -126,7 +126,7 @@ X-Foo-Flag: Something with a Description
X-Bar-Flag: no
" aptcache show apt-intermixed2
-testequal "Package: apt-intermixed3
+testsuccessequal "Package: apt-intermixed3
$PACKAGESTANZA
$TRANSDESCRIPTION
Description-md5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -152,7 +152,7 @@ Reverse Provides: '
testempty aptcache search nonexistentstring
# packages without a description can't be found
-testequal 'apt-normal - commandline package manager
+testsuccessequal 'apt-normal - commandline package manager
apt-both-below - commandline package manager
apt-both-middle - commandline package manager
apt-both-top - commandline package manager
diff --git a/test/integration/test-bug-717891-abolute-uris-for-proxies b/test/integration/test-bug-717891-abolute-uris-for-proxies
index 54a616686..ef948c2d5 100755
--- a/test/integration/test-bug-717891-abolute-uris-for-proxies
+++ b/test/integration/test-bug-717891-abolute-uris-for-proxies
@@ -19,7 +19,7 @@ echo 'Acquire::http::Proxy "http://localhost:8080";' > rootdir/etc/apt/apt.conf.
msgtest 'Check that requests to proxies are' 'absolute uris'
testsuccess --nomsg aptget update
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
unrelated
diff --git a/test/integration/test-apt-bug-718329-support-data.tar b/test/integration/test-bug-718329-support-data.tar-uncompressed
index 5cfb31917..d2845f768 100755
--- a/test/integration/test-apt-bug-718329-support-data.tar
+++ b/test/integration/test-bug-718329-support-data.tar-uncompressed
@@ -5,16 +5,16 @@ test_process_package_with_compression() {
COMPRESSOR="$1"
DATA_TAR="$2"
- msgtest "Testing apt-ftparchive with compression type: $COMPRESSOR"
+ msgmsg "Testing apt-ftparchive with compression type: $COMPRESSOR"
buildsimplenativepackage 'pkg' 'all' '1.0' '' '' 'some descr' '' '' '' "$COMPRESSOR"
- testequal "debian-binary
+ testsuccessequal "debian-binary
control.tar.gz
$DATA_TAR" ar t incoming/pkg_1.0_all.deb
testequal "Package: pkg" echo "$(aptftparchive packages incoming/|grep ^Package)"
- testequal "usr/bin/pkg-all pkg
+ testsuccessequal "usr/bin/pkg-all pkg
usr/share/doc/pkg/FEATURES pkg
usr/share/doc/pkg/changelog pkg
usr/share/doc/pkg/copyright pkg" aptftparchive contents incoming/
@@ -29,6 +29,3 @@ setupenvironment
test_process_package_with_compression "gzip" "data.tar.gz"
test_process_package_with_compression "none" "data.tar"
test_process_package_with_compression "xz" "data.tar.xz"
-
-
-
diff --git a/test/integration/test-bug-719263-print-uris-removes-authentication b/test/integration/test-bug-719263-print-uris-removes-authentication
index 5e674db0b..207bf4611 100755
--- a/test/integration/test-bug-719263-print-uris-removes-authentication
+++ b/test/integration/test-bug-719263-print-uris-removes-authentication
@@ -15,7 +15,7 @@ setupaptarchive
testnoact() {
cp -a rootdir/var/lib/dpkg/status rootdir/var/lib/dpkg/status-backup-noact
touch rootdir/var/lib/apt/extended_states
- testequal 'Reading package lists...
+ testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following packages will be upgraded:
diff --git a/test/integration/test-bug-720597-build-dep-purge b/test/integration/test-bug-720597-build-dep-purge
index 1e24ed5f1..6fa261fbd 100755
--- a/test/integration/test-bug-720597-build-dep-purge
+++ b/test/integration/test-bug-720597-build-dep-purge
@@ -13,7 +13,7 @@ buildsimplenativepackage 'pkgc' 'amd64' '1' 'stable' 'Build-Depends: pkgb'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
pkga
@@ -24,7 +24,7 @@ Remv pkga [1]
Inst pkgb (1 stable [amd64])
Conf pkgb (1 stable [amd64])' aptget build-dep pkgc -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
pkga*
diff --git a/test/integration/test-bug-722207-print-uris-even-if-very-quiet b/test/integration/test-bug-722207-print-uris-even-if-very-quiet
index 9a5685703..1fa94de7d 100755
--- a/test/integration/test-bug-722207-print-uris-even-if-very-quiet
+++ b/test/integration/test-bug-722207-print-uris-even-if-very-quiet
@@ -12,19 +12,20 @@ insertpackage 'unstable' 'apt' 'all' '2'
insertsource 'unstable' 'apt' 'all' '2'
insertsource 'unstable' 'apt2' 'all' '1'
+getoriginfromsuite() { echo 'Debian'; }
setupaptarchive
APTARCHIVE=$(readlink -f ./aptarchive)
-testequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 " aptget upgrade -qq --print-uris
-testequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 " aptget dist-upgrade -qq --print-uris
-testequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 " aptget install apt -qq --print-uris
-testequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 " aptget download apt -qq --print-uris
-testequal "'file://${APTARCHIVE}/apt_2.dsc' apt_2.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
-'file://${APTARCHIVE}/apt_2.tar.gz' apt_2.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source apt -qq --print-uris
-testequal "'http://packages.debian.org/changelogs/pool/main/apt/apt_2/changelog'" aptget changelog apt -qq --print-uris
+testsuccessequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 " aptget upgrade -qq --print-uris
+testsuccessequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 " aptget dist-upgrade -qq --print-uris
+testsuccessequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 " aptget install apt -qq --print-uris
+testsuccessequal "'file://${APTARCHIVE}/pool/main/apt/apt_2_all.deb' apt_2_all.deb 0 " aptget download apt -qq --print-uris
+testsuccessequal "'file://${APTARCHIVE}/apt_2.dsc' apt_2.dsc 9 MD5Sum:16ff470aaedad0f06fb951ed89ffdd3a
+'file://${APTARCHIVE}/apt_2.tar.gz' apt_2.tar.gz 12 MD5Sum:ab2b546f59ff9e8f5cc7a2d987ff3373" aptget source apt -qq --print-uris
+testsuccessequal "'http://metadata.ftp-master.debian.org/changelogs/main/a/apt/apt_2_changelog' apt.changelog" aptget changelog apt -qq --print-uris
-testequal "'file://${APTARCHIVE}/apt_2.dsc' apt_2.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
-'file://${APTARCHIVE}/apt_2.tar.gz' apt_2.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
-'file://${APTARCHIVE}/apt2_1.dsc' apt2_1.dsc 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e
-'file://${APTARCHIVE}/apt2_1.tar.gz' apt2_1.tar.gz 0 MD5Sum:d41d8cd98f00b204e9800998ecf8427e" aptget source apt apt2 -qq --print-uris
+testsuccessequal "'file://${APTARCHIVE}/apt_2.dsc' apt_2.dsc 9 MD5Sum:16ff470aaedad0f06fb951ed89ffdd3a
+'file://${APTARCHIVE}/apt_2.tar.gz' apt_2.tar.gz 12 MD5Sum:ab2b546f59ff9e8f5cc7a2d987ff3373
+'file://${APTARCHIVE}/apt2_1.dsc' apt2_1.dsc 10 MD5Sum:4c572ce45f1e2bedbb30da7f5e1c241c
+'file://${APTARCHIVE}/apt2_1.tar.gz' apt2_1.tar.gz 13 MD5Sum:2a96fec139f8722d93312a1ff8281232" aptget source apt apt2 -qq --print-uris
diff --git a/test/integration/test-bug-723586-any-stripped-in-single-arch b/test/integration/test-bug-723586-any-stripped-in-single-arch
index 392b88e9f..0cf3362cf 100755
--- a/test/integration/test-bug-723586-any-stripped-in-single-arch
+++ b/test/integration/test-bug-723586-any-stripped-in-single-arch
@@ -41,14 +41,14 @@ The following packages have unmet dependencies:
python-mips : Depends: python3:mips but it is not installable
E: Unable to correct problems, you have held broken packages.'
-testequal "$INSTALLLOG" aptget install python3-gnupg -s
+testsuccessequal "$INSTALLLOG" aptget install python3-gnupg -s
aptcache showpkg python3 > showpkg.log
-testequal "$FAILLOG" aptget install python-mips -s
+testfailureequal "$FAILLOG" aptget install python-mips -s
# same test, but this time in a multi-arch environment
configarchitecture 'amd64' 'armhf'
rm rootdir/var/cache/apt/*.bin
-testequal "$INSTALLLOG" aptget install python3-gnupg -s
-testequal "$(sed 's#3.3.2-16 - python3#3.3.2-16 - python3:any:armhf python3#' showpkg.log)" aptcache showpkg python3
-testequal "$FAILLOG" aptget install python-mips -s
+testsuccessequal "$INSTALLLOG" aptget install python3-gnupg -s
+testsuccessequal "$(sed 's#3.3.2-16 - python3#3.3.2-16 - python3:any:armhf python3#' showpkg.log)" aptcache showpkg python3
+testfailureequal "$FAILLOG" aptget install python-mips -s
diff --git a/test/integration/test-bug-728500-tempdir b/test/integration/test-bug-728500-tempdir
index 37e5a013e..3ae94c58f 100755
--- a/test/integration/test-bug-728500-tempdir
+++ b/test/integration/test-bug-728500-tempdir
@@ -26,5 +26,5 @@ else
fi
unset TMPDIR
-testequal 'coolstuff' aptcache pkgnames
+testsuccessequal 'coolstuff' aptcache pkgnames
testsuccess ls rootdir/var/lib/apt/lists/*InRelease
diff --git a/test/integration/test-bug-732746-preferences b/test/integration/test-bug-732746-preferences
index b31f98aa0..ce73f1c17 100755
--- a/test/integration/test-bug-732746-preferences
+++ b/test/integration/test-bug-732746-preferences
@@ -25,7 +25,7 @@ Pin-Priority: 700
#Pin: 800
EOF
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree..." aptget check
msgtest "Ensure policy is applied"
diff --git a/test/integration/test-bug-735967-lib32-to-i386-unavailable b/test/integration/test-bug-735967-lib32-to-i386-unavailable
index 826931fe4..eb6e1a331 100755
--- a/test/integration/test-bug-735967-lib32-to-i386-unavailable
+++ b/test/integration/test-bug-735967-lib32-to-i386-unavailable
@@ -31,7 +31,7 @@ setupaptarchive --no-update
configarchitecture 'amd64'
testsuccess aptget update
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
@@ -43,7 +43,7 @@ Remv lib32nss-mdns [0.9-1]
Inst libnss-mdns [0.9-1] (0.10-6 unstable [amd64])
Conf libnss-mdns (0.10-6 unstable [amd64])' aptget dist-upgrade -s
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
@@ -59,7 +59,7 @@ E: Unable to correct problems, you have held broken packages.' aptget install fo
configarchitecture 'amd64' 'i386'
testsuccess aptget update
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following NEW packages will be installed:
@@ -76,7 +76,7 @@ Conf libnss-mdns (0.10-6 unstable [amd64])
Conf libnss-mdns-i386:i386 (0.10-6 unstable [i386])
Conf lib32nss-mdns (0.10-6 unstable [amd64])' aptget dist-upgrade -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
libfoo libfoo-bin:i386
diff --git a/test/integration/test-bug-738785-switch-protocol b/test/integration/test-bug-738785-switch-protocol
index 0f458e099..e86f28824 100755
--- a/test/integration/test-bug-738785-switch-protocol
+++ b/test/integration/test-bug-738785-switch-protocol
@@ -10,6 +10,7 @@ configarchitecture "i386"
buildsimplenativepackage 'apt' 'all' '1.0' 'stable'
# setup http redirecting to https
+getlabelfromsuite() { echo 'Testcases'; }
setupaptarchive --no-update
changetowebserver -o 'aptwebserver::redirect::replace::/redirectme/=https://localhost:4433/' \
-o 'aptwebserver::redirect::replace::/downgrademe/=http://localhost:8080/' \
@@ -20,10 +21,10 @@ sed -i -e 's#:4433/#:8080/redirectme#' -e 's# https:# http:#' rootdir/etc/apt/so
testsuccess aptget update -o Debug::Acquire::http=1 -o Debug::Acquire::https=1 -o Debug::pkgAcquire::Worker=1
msgtest 'Test that the webserver does not answer' 'http requests'
-downloadfile 'http://localhost:8080/pool/apt_1.0/changelog' changelog >/dev/null 2>&1 && msgfail || msgpass
+downloadfile 'http://localhost:8080/pool/main/a/apt/apt_1.0/changelog' changelog >/dev/null 2>&1 && msgfail || msgpass
-echo 'Apt::Changelogs::Server "http://localhost:8080/redirectme";' > rootdir/etc/apt/apt.conf.d/changelog.conf
-testequal "'http://localhost:8080/redirectme/pool/apt_1.0/changelog'" aptget changelog apt --print-uris
+echo 'Acquire::Changelogs::URI::Label::Testcases "http://localhost:8080/redirectme/pool/CHANGEPATH/changelog";' > rootdir/etc/apt/apt.conf.d/changelog.conf
+testsuccessequal "'http://localhost:8080/redirectme/pool/main/a/apt/apt_1.0/changelog' apt.changelog" aptget changelog apt --print-uris
cd downloaded
testsuccess aptget changelog apt -d
@@ -38,28 +39,24 @@ cd - >/dev/null
testsuccess aptget install apt -y
testdpkginstalled 'apt'
-# create a copy of all methods, expect https
-eval `aptconfig shell METHODS Dir::Bin::Methods/d`
-COPYMETHODS='usr/lib/apt/methods'
-mv rootdir/${COPYMETHODS} rootdir/${COPYMETHODS}.bak
-mkdir -p rootdir/$COPYMETHODS
-cd rootdir/$COPYMETHODS
-find $METHODS \! -type d | while read meth; do
- ln -s $meth
+# install a slowed down file: otherwise its to fast to reproduce combining
+NEWMETHODS="$(readlink -f rootdir)/usr/lib/apt/methods"
+OLDMETHODS="$(readlink -f rootdir/usr/lib/apt/methods)"
+rm $NEWMETHODS
+mkdir $NEWMETHODS
+for METH in $(find $OLDMETHODS ! -type d); do
+ ln -s $OLDMETHODS/$(basename $METH) $NEWMETHODS
done
-rm https
-cd - >/dev/null
-echo "Dir::Bin::Methods \"${COPYMETHODS}\";" >> aptconfig.conf
+rm $NEWMETHODS/https
cd downloaded
-testequal "E: The method driver $(readlink -f './../')/rootdir/usr/lib/apt/methods/https could not be found.
+testfailureequal "E: The method driver $(readlink -f './../')/rootdir/usr/lib/apt/methods/https could not be found.
N: Is the package apt-transport-https installed?" aptget download apt -q=0
testfailure test -e apt_1.0_all.deb
cd - >/dev/null
# revert to all methods
-rm -rf rootdir/$COPYMETHODS
-mv rootdir/${COPYMETHODS}.bak rootdir/${COPYMETHODS}
+ln -s $OLDMETHODS/https $NEWMETHODS
# check that downgrades from https to http are not allowed
webserverconfig 'aptwebserver::support::http' 'true'
diff --git a/test/integration/test-bug-745036-new-foreign-invalidates-cache b/test/integration/test-bug-745036-new-foreign-invalidates-cache
index 2b7ee06ad..bfa0f817c 100755
--- a/test/integration/test-bug-745036-new-foreign-invalidates-cache
+++ b/test/integration/test-bug-745036-new-foreign-invalidates-cache
@@ -14,7 +14,7 @@ setupaptarchive
testsuccess aptget check -s
configarchitecture 'amd64' 'i386'
-testequal 'E: The package cache was built for different architectures: amd64 vs amd64,i386' aptget check -s -o pkgCacheFile::Generate=false
+testfailureequal 'E: The package cache was built for different architectures: amd64 vs amd64,i386' aptget check -s -o pkgCacheFile::Generate=false
testsuccess aptget check -s
diff --git a/test/integration/test-bug-745046-candidate-propagation-fails b/test/integration/test-bug-745046-candidate-propagation-fails
index e4aa67a72..f54e1872e 100755
--- a/test/integration/test-bug-745046-candidate-propagation-fails
+++ b/test/integration/test-bug-745046-candidate-propagation-fails
@@ -14,7 +14,7 @@ insertpackage 'experimental' 'gedit' 'amd64' '2' 'Depends: common (>= 2)'
setupaptarchive
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Selected version '2' (experimental [amd64]) for 'gedit'
Some packages could not be installed. This may mean that you have
@@ -29,7 +29,7 @@ E: Unable to correct problems, you have held broken packages." aptget install ge
insertinstalledpackage 'common' 'amd64' '2'
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Selected version '2' (experimental [amd64]) for 'gedit'
The following packages will be upgraded:
diff --git a/test/integration/test-bug-753297-upgradable b/test/integration/test-bug-753297-upgradable
index 01395a095..53bf3361b 100755
--- a/test/integration/test-bug-753297-upgradable
+++ b/test/integration/test-bug-753297-upgradable
@@ -25,9 +25,9 @@ insertpackage 'testing' 'bar' 'all' '2'
setupaptarchive
-testequal "Listing...
+testsuccessequal "Listing...
bar/testing 2 all [upgradable from: 1]" apt list --upgradable
-testequal "Listing...
+testsuccessequal "Listing...
bar/testing 2 all [upgradable from: 1]
foo/testing,now 1 all [installed]" apt list
diff --git a/test/integration/test-bug-758153-versioned-provides-support b/test/integration/test-bug-758153-versioned-provides-support
index 21f9123c9..30bc921c3 100755
--- a/test/integration/test-bug-758153-versioned-provides-support
+++ b/test/integration/test-bug-758153-versioned-provides-support
@@ -24,9 +24,15 @@ insertpackage 'experimental' 'foreign-webserver' 'i386' '4' 'Multi-Arch: foreign
Provides: httpd (= 4)'
insertpackage 'experimental' 'cool-webapp' 'all' '4' 'Depends: httpd (>= 4)'
+# arch-qualified provides, see #777071
+insertpackage 'unstable' 'foo' 'all' '1' 'Provides: bar:i386'
+insertpackage 'unstable' 'baz' 'i386,amd64' '1' 'Depends: bar'
+insertpackage 'experimental' 'baz' 'i386,amd64' '2' 'Depends: bar:i386'
+insertpackage 'experimental' 'baz-broken' 'i386' '2' 'Depends: bar:amd64'
+
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
@@ -37,7 +43,7 @@ Inst webapp [1] (2 unstable [all])
Conf webserver (2 unstable [amd64])
Conf webapp (2 unstable [all])' aptget dist-upgrade -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following packages will be upgraded:
webapp webserver
@@ -47,7 +53,7 @@ Inst webapp [1] (2 unstable [all])
Conf webserver (2 unstable [amd64])
Conf webapp (2 unstable [all])' aptget install webapp webserver -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following packages will be upgraded:
webapp webserver
@@ -57,7 +63,7 @@ Inst webapp [1] (3 experimental [all])
Conf webserver (2 unstable [amd64])
Conf webapp (3 experimental [all])' aptget install webapp=3 webserver -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following packages will be upgraded:
webapp webserver
@@ -67,7 +73,7 @@ Inst webapp [1] (2 unstable [all])
Conf webserver (3 experimental [amd64])
Conf webapp (2 unstable [all])' aptget install webapp webserver=3 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foreign-webserver:i386
@@ -79,7 +85,7 @@ Inst webapp [1] (2 unstable [all])
Conf foreign-webserver:i386 (2 unstable [i386])
Conf webapp (2 unstable [all])' aptget install webapp foreign-webserver:i386 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foreign-webserver:i386
@@ -91,7 +97,7 @@ Inst webapp [1] (3 experimental [all])
Conf foreign-webserver:i386 (2 unstable [i386])
Conf webapp (3 experimental [all])' aptget install webapp=3 foreign-webserver:i386 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foreign-webserver:i386
@@ -103,7 +109,7 @@ Inst webapp [1] (2 unstable [all])
Conf foreign-webserver:i386 (4 experimental [i386])
Conf webapp (2 unstable [all])' aptget install webapp foreign-webserver:i386=4 -s
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
@@ -115,7 +121,7 @@ The following packages have unmet dependencies:
cool-webapp : Depends: httpd (>= 4)
E: Unable to correct problems, you have held broken packages.' aptget install cool-webapp -s
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
@@ -127,7 +133,7 @@ The following packages have unmet dependencies:
cool-webapp : Depends: httpd (>= 4)
E: Unable to correct problems, you have held broken packages.' aptget install cool-webapp foreign-webserver:i386 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
cool-webapp foreign-webserver:i386
@@ -136,3 +142,65 @@ Inst foreign-webserver:i386 (4 experimental [i386])
Inst cool-webapp (4 experimental [all])
Conf foreign-webserver:i386 (4 experimental [i386])
Conf cool-webapp (4 experimental [all])' aptget install cool-webapp foreign-webserver:i386=4 -s
+
+testsuccessequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+ foo
+The following NEW packages will be installed:
+ baz:i386 foo
+0 upgraded, 2 newly installed, 0 to remove and 2 not upgraded.
+Inst foo (1 unstable [all])
+Inst baz:i386 (1 unstable [i386])
+Conf foo (1 unstable [all])
+Conf baz:i386 (1 unstable [i386])' aptget install baz:i386 -s
+
+testfailureequal 'Reading package lists...
+Building dependency tree...
+Some packages could not be installed. This may mean that you have
+requested an impossible situation or if you are using the unstable
+distribution that some required packages have not yet been created
+or been moved out of Incoming.
+The following information may help to resolve the situation:
+
+The following packages have unmet dependencies:
+ baz : Depends: bar but it is not installable
+E: Unable to correct problems, you have held broken packages.' aptget install baz:amd64 -s
+
+testsuccessequal "Reading package lists...
+Building dependency tree...
+Selected version '2' (experimental [amd64]) for 'baz'
+The following extra packages will be installed:
+ foo
+The following NEW packages will be installed:
+ baz foo
+0 upgraded, 2 newly installed, 0 to remove and 2 not upgraded.
+Inst foo (1 unstable [all])
+Inst baz (2 experimental [amd64])
+Conf foo (1 unstable [all])
+Conf baz (2 experimental [amd64])" aptget install baz/experimental -s -q=0
+
+testsuccessequal "Reading package lists...
+Building dependency tree...
+Selected version '2' (experimental [i386]) for 'baz:i386'
+The following extra packages will be installed:
+ foo
+The following NEW packages will be installed:
+ baz:i386 foo
+0 upgraded, 2 newly installed, 0 to remove and 2 not upgraded.
+Inst foo (1 unstable [all])
+Inst baz:i386 (2 experimental [i386])
+Conf foo (1 unstable [all])
+Conf baz:i386 (2 experimental [i386])" aptget install baz:i386/experimental -s -q=0
+
+testfailureequal 'Reading package lists...
+Building dependency tree...
+Some packages could not be installed. This may mean that you have
+requested an impossible situation or if you are using the unstable
+distribution that some required packages have not yet been created
+or been moved out of Incoming.
+The following information may help to resolve the situation:
+
+The following packages have unmet dependencies:
+ baz-broken:i386 : Depends: bar but it is not installable
+E: Unable to correct problems, you have held broken packages.' aptget install baz-broken -s
diff --git a/test/integration/test-bug-769609-triggers-still-pending-after-run b/test/integration/test-bug-769609-triggers-still-pending-after-run
new file mode 100755
index 000000000..146fa766b
--- /dev/null
+++ b/test/integration/test-bug-769609-triggers-still-pending-after-run
@@ -0,0 +1,75 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'amd64'
+
+msgtest 'Check if installed dpkg supports' 'noawait trigger'
+if dpkg-checkbuilddeps -d 'dpkg (>= 1.16.1)' /dev/null; then
+ msgpass
+else
+ msgskip 'dpkg version too old'
+ exit 0
+fi
+configdpkgnoopchroot
+
+buildtriggerpackages() {
+ local TYPE="$1"
+ setupsimplenativepackage "triggerable-$TYPE" 'all' '1.0' 'unstable' "Depends: trigdepends-$TYPE"
+ BUILDDIR="incoming/triggerable-${TYPE}-1.0"
+ cat >${BUILDDIR}/debian/postinst <<EOF
+#!/bin/sh
+if [ "\$1" = 'triggered' ]; then
+ ls -l /proc/self/fd/
+fi
+EOF
+ echo "$TYPE /usr/share/doc" > ${BUILDDIR}/debian/triggers
+ buildpackage "$BUILDDIR" 'unstable' 'main' 'native'
+ rm -rf "$BUILDDIR"
+ buildsimplenativepackage "trigdepends-$TYPE" 'all' '1.0' 'unstable'
+}
+
+#buildtriggerpackages 'interest'
+buildtriggerpackages 'interest-noawait'
+buildsimplenativepackage "trigstuff" 'all' '1.0' 'unstable'
+
+setupaptarchive
+
+runtests() {
+ local TYPE="$1"
+ msgmsg 'Working with trigger type' "$TYPE"
+ testsuccess aptget install triggerable-$TYPE -y
+ cp rootdir/tmp/testsuccess.output terminal.output
+ testsuccess grep '^REWRITE ' terminal.output
+ testdpkginstalled triggerable-$TYPE trigdepends-$TYPE
+
+ testsuccess aptget install trigdepends-$TYPE -y --reinstall
+ cp rootdir/tmp/testsuccess.output terminal.output
+ testsuccess grep '^REWRITE ' terminal.output
+ testsuccess grep ' root root ' terminal.output
+ testdpkginstalled triggerable-$TYPE trigdepends-$TYPE
+
+ testsuccess aptget install trigstuff -y
+ cp rootdir/tmp/testsuccess.output terminal.output
+ testsuccess grep '^REWRITE ' terminal.output
+ testsuccess grep ' root root ' terminal.output
+ testdpkginstalled triggerable-$TYPE trigdepends-$TYPE trigstuff
+
+ testsuccess aptget purge trigstuff -y
+ cp rootdir/tmp/testsuccess.output terminal.output
+ testsuccess grep '^REWRITE ' terminal.output
+ testsuccess grep ' root root ' terminal.output
+ testdpkginstalled triggerable-$TYPE trigdepends-$TYPE
+ testdpkgnotinstalled trigstuff
+
+ testsuccess aptget purge trigdepends-$TYPE -y
+ cp rootdir/tmp/testsuccess.output terminal.output
+ testfailure grep '^REWRITE ' terminal.output
+ testfailure grep ' root root ' terminal.output
+ testdpkgnotinstalled triggerable-$TYPE trigdepends-$TYPE
+}
+#runtests 'interest'
+runtests 'interest-noawait'
diff --git a/test/integration/test-bug-770291-reinstall b/test/integration/test-bug-770291-reinstall
new file mode 100755
index 000000000..a5b2aff07
--- /dev/null
+++ b/test/integration/test-bug-770291-reinstall
@@ -0,0 +1,98 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'i386'
+
+insertpackage 'unstable,installed' 'libc6' 'i386' '1'
+insertpackage 'unstable,installed' 'libselinux1' 'i386' '1'
+
+cp rootdir/var/lib/dpkg/status dpkg.status
+
+insertpackage 'unstable,installed' 'init' 'i386' '1' 'Depends: systemd-sysv
+Essential: yes'
+insertpackage 'unstable,installed' 'systemd-sysv' 'i386' '215-5+b1' 'Depends: systemd (= 215-5+b1)
+Pre-Depends: systemd'
+# fun fact: we need these two pre-depends to get systemd ordered before systemd-sysv as
+# many pre-depends mean: do early (as they are a pain, so get them out of the way early)
+insertpackage 'unstable,installed' 'systemd' 'i386' '215-5+b1' 'Pre-Depends: libc6, libselinux1'
+
+# depends loop
+insertpackage 'unstable,installed' 'dependsA' 'i386' '1' 'Depends: dependsB
+Essential: yes'
+insertpackage 'unstable,installed' 'dependsB' 'i386' '1' 'Depends: dependsA
+Essential: yes'
+
+# pre-depends loop
+insertpackage 'unstable,installed' 'predependsA' 'i386' '1' 'Pre-Depends: predependsB
+Essential: yes'
+insertpackage 'unstable,installed' 'predependsB' 'i386' '1' 'Pre-Depends: predependsA
+Essential: yes'
+
+# pre-depends-to-depends loop
+insertpackage 'unstable,installed' 'predependsdependsA' 'i386' '1' 'Pre-Depends: predependsdependsB
+Essential: yes'
+insertpackage 'unstable,installed' 'predependsdependsB' 'i386' '1' 'Depends: predependsdependsA
+Essential: yes'
+
+setupaptarchive
+
+testsuccessequal 'Reading package lists...
+Building dependency tree...
+0 upgraded, 0 newly installed, 2 reinstalled, 0 to remove and 0 not upgraded.
+Inst systemd [215-5+b1] (215-5+b1 unstable [i386])
+Conf systemd (215-5+b1 unstable [i386])
+Inst systemd-sysv [215-5+b1] (215-5+b1 unstable [i386])
+Conf systemd-sysv (215-5+b1 unstable [i386])' aptget install --reinstall systemd systemd-sysv -s
+
+testsuccessequal 'Reading package lists...
+Building dependency tree...
+0 upgraded, 0 newly installed, 2 reinstalled, 0 to remove and 0 not upgraded.
+Inst dependsA [1] (1 unstable [i386])
+Inst dependsB [1] (1 unstable [i386])
+Conf dependsB (1 unstable [i386])
+Conf dependsA (1 unstable [i386])' aptget install --reinstall dependsA dependsB -s
+
+# there is a chance dpkg can actually do these, BUT this depends on the maintainerscripts (not) present
+# which is very very risky to depend on (and apt doesn't know about that anyhow).
+testfailure aptget install --reinstall predependsA predependsB -s -o Debug::pkgPackageManager=1
+testequal "E: Couldn't configure predependsA:i386, probably a dependency cycle." tail -n1 rootdir/tmp/testfailure.output
+
+# FIXME: the error message is a catch all here, not like the one above
+testfailure aptget install --reinstall predependsdependsA predependsdependsB -s -o Debug::pkgPackageManager=1
+testequal "E: Could not configure 'predependsdependsB:i386'. " tail -n1 rootdir/tmp/testfailure.output
+
+
+msgmsg 'While we are at it, lets try these loops without reinstall as well'
+cp dpkg.status rootdir/var/lib/dpkg/status
+
+testsuccessequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ systemd systemd-sysv
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst systemd (215-5+b1 unstable [i386])
+Conf systemd (215-5+b1 unstable [i386])
+Inst systemd-sysv (215-5+b1 unstable [i386])
+Conf systemd-sysv (215-5+b1 unstable [i386])' aptget install systemd systemd-sysv -s
+
+testsuccessequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ dependsA dependsB
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst dependsA (1 unstable [i386]) []
+Inst dependsB (1 unstable [i386])
+Conf dependsB (1 unstable [i386])
+Conf dependsA (1 unstable [i386])' aptget install dependsA dependsB -s
+
+# there is a chance dpkg can actually do these, BUT this depends on the maintainerscripts (not) present
+# which is very very risky to depend on (and apt doesn't know about that anyhow).
+testfailure aptget install predependsA predependsB -s -o Debug::pkgPackageManager=1
+testequal "E: Couldn't configure predependsA:i386, probably a dependency cycle." tail -n1 rootdir/tmp/testfailure.output
+
+# FIXME: the error message is a catch all here, not like the one above
+testfailure aptget install predependsdependsA predependsdependsB -s -o Debug::pkgPackageManager=1
+testequal "E: Could not configure 'predependsdependsB:i386'. " tail -n1 rootdir/tmp/testfailure.output
diff --git a/test/integration/test-bug-778375-server-has-no-reason-phrase b/test/integration/test-bug-778375-server-has-no-reason-phrase
new file mode 100755
index 000000000..23481ef88
--- /dev/null
+++ b/test/integration/test-bug-778375-server-has-no-reason-phrase
@@ -0,0 +1,40 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'native'
+
+echo 'found' > aptarchive/working
+changetohttpswebserver -o 'aptwebserver::redirect::replace::/redirectme/=/' \
+ -o 'aptwebserver::httpcode::200=200' -o 'aptwebserver::httpcode::404=404' \
+ -o 'aptwebserver::httpcode::301=301'
+
+testdownload() {
+ rm -f downfile
+ msgtest "download of a $1 via" "${3%%:*}"
+ $2 --nomsg downloadfile "$3" downfile
+
+ cp rootdir/tmp/testsuccess.output download.log
+ #looking for "HTTP server doesn't give Reason-Phrase for 200"
+ testsuccess grep 'give Reason-Phrase for' download.log
+
+ if [ "$2" = 'testsuccess' ]; then
+ testfileequal downfile 'found'
+ else
+ testfailure test -e downfile
+ fi
+}
+
+runtest() {
+ testdownload 'file works' 'testsuccess' "$1/working"
+ testdownload 'file via redirect works' 'testsuccess' "$1/redirectme/working"
+
+ testdownload 'non-existent file fails' 'testfailure' "$1/failing"
+ testdownload 'non-existent file via redirect fails' 'testfailure' "$1/redirectme/failing"
+}
+
+runtest 'http://localhost:8080'
+runtest 'https://localhost:4433'
diff --git a/test/integration/test-bug-782777-single-arch-weirdness b/test/integration/test-bug-782777-single-arch-weirdness
new file mode 100755
index 000000000..004903385
--- /dev/null
+++ b/test/integration/test-bug-782777-single-arch-weirdness
@@ -0,0 +1,72 @@
+#!/bin/sh
+# Ensure that the order in which packages are in the binary cache
+# does not effect if they can be found or not
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'i386'
+
+insertpackage 'unstable' 'abar' 'i386' '1'
+insertpackage 'unstable' 'foobar' 'i386' '1' 'Depends: abar:amd64, zfoo:amd64'
+insertpackage 'unstable' 'zfoo' 'i386' '1'
+
+setupaptarchive
+
+testrun() {
+ rm -f rootdir/var/lib/apt/extended_states
+
+ testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ abar zfoo
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst abar (1 unstable [i386])
+Inst zfoo (1 unstable [i386])
+Conf abar (1 unstable [i386])
+Conf zfoo (1 unstable [i386])' aptget install abar zfoo -s
+
+ testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ abar zfoo
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst abar (1 unstable [i386])
+Inst zfoo (1 unstable [i386])
+Conf abar (1 unstable [i386])
+Conf zfoo (1 unstable [i386])' aptget install abar:i386 zfoo:i386 -s
+
+ testequal "Reading package lists...
+Building dependency tree...
+Package abar:amd64 is not available, but is referred to by another package.
+This may mean that the package is missing, has been obsoleted, or
+is only available from another source
+
+Package zfoo:amd64 is not available, but is referred to by another package.
+This may mean that the package is missing, has been obsoleted, or
+is only available from another source
+
+E: Package 'abar:amd64' has no installation candidate
+E: Package 'zfoo:amd64' has no installation candidate" aptget install abar:amd64 zfoo:amd64 -s
+
+ cp -f rootdir/var/lib/dpkg/status status.backup
+ insertinstalledpackage 'abar' 'i386' '1'
+ insertinstalledpackage 'zfoo' 'i386' '1'
+
+ testequal 'abar
+zfoo' aptmark showmanual abar zfoo
+ testequal 'abar set to automatically installed.
+zfoo set to automatically installed.' aptmark auto abar zfoo
+ testempty aptmark showmanual abar zfoo
+ testequal 'abar
+zfoo' aptmark showauto abar zfoo
+
+ mv -f status.backup rootdir/var/lib/dpkg/status
+}
+
+msgmsg 'Single-Arch testrun'
+testrun
+msgmsg 'Multi-Arch testrun'
+configarchitecture 'i386' 'amd64'
+testrun
diff --git a/test/integration/test-bug-lp1445239-download-loop b/test/integration/test-bug-lp1445239-download-loop
new file mode 100755
index 000000000..4e4de67bd
--- /dev/null
+++ b/test/integration/test-bug-lp1445239-download-loop
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# this is a regression test for LP: #1445239 where a partial download can
+# trigger an endless hang of the download method
+#
+
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64'
+
+changetowebserver
+webserverconfig 'aptwebserver::support::range' 'true'
+
+TESTFILE='aptarchive/testfile'
+dd if=/dev/zero of=$TESTFILE bs=100k count=1 2>/dev/null
+
+DOWNLOADLOG='rootdir/tmp/testdownloadfile.log'
+
+TARGET=./downloaded/testfile-downloaded
+dd if=/dev/zero of=$TARGET bs=99k count=1 2>/dev/null
+if ! downloadfile http://localhost:8080/testfile "$TARGET" > "$DOWNLOADLOG"; then
+ cat >&2 "$DOWNLOADLOG"
+ msgfail
+else
+ msgpass
+fi
diff --git a/test/integration/test-bug-multiarch-upgrade b/test/integration/test-bug-multiarch-upgrade
index c29e1f903..56071f184 100755
--- a/test/integration/test-bug-multiarch-upgrade
+++ b/test/integration/test-bug-multiarch-upgrade
@@ -16,7 +16,7 @@ insertpackage 'unstable' 'libcups2' 'i386' '2' 'Multi-Arch: same'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
libcups2
diff --git a/test/integration/test-cachecontainer-architecture-specification b/test/integration/test-cachecontainer-architecture-specification
index 47abfb5b0..e5625e811 100755
--- a/test/integration/test-cachecontainer-architecture-specification
+++ b/test/integration/test-cachecontainer-architecture-specification
@@ -12,31 +12,31 @@ insertpackage 'unstable' 'foo' 'all' '1'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
libsame
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Inst libsame (1 unstable [amd64])
Conf libsame (1 unstable [amd64])' aptget -s install libsame
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
libsame:armel
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Inst libsame:armel (1 unstable [armel])
Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:armel
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
E: Unable to locate package libsame' aptget -s install libsame:armhf
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
libsame
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Inst libsame (1 unstable [amd64])
Conf libsame (1 unstable [amd64])' aptget -s install libsame:amd64
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
libsame libsame:armel
@@ -45,7 +45,7 @@ Inst libsame (1 unstable [amd64])
Inst libsame:armel (1 unstable [armel])
Conf libsame (1 unstable [amd64])
Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:armel libsame:amd64
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
libsame libsame:armel
@@ -54,14 +54,14 @@ Inst libsame (1 unstable [amd64])
Inst libsame:armel (1 unstable [armel])
Conf libsame (1 unstable [amd64])
Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:*
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
libsame
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Inst libsame (1 unstable [amd64])
Conf libsame (1 unstable [amd64])' aptget -s install libsame:any
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
libsame libsame:armel
@@ -70,14 +70,14 @@ Inst libsame (1 unstable [amd64])
Inst libsame:armel (1 unstable [armel])
Conf libsame (1 unstable [amd64])
Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:a*
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
libsame
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Inst libsame (1 unstable [amd64])
Conf libsame (1 unstable [amd64])' aptget -s install libsame:linux-any
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
libsame libsame:armel
@@ -86,35 +86,35 @@ Inst libsame (1 unstable [amd64])
Inst libsame:armel (1 unstable [armel])
Conf libsame (1 unstable [amd64])
Conf libsame:armel (1 unstable [armel])' aptget -s install libsame:linux-*
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
E: Unable to locate package libsame' aptget -s install libsame:windows-any
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
E: Unable to locate package foo' aptget -s install foo:armel
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Inst foo (1 unstable [all])
Conf foo (1 unstable [all])' aptget -s install foo
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Inst foo (1 unstable [all])
Conf foo (1 unstable [all])' aptget -s install foo:all
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Inst foo (1 unstable [all])
Conf foo (1 unstable [all])' aptget -s install foo:amd64
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo
diff --git a/test/integration/test-compressed-indexes b/test/integration/test-compressed-indexes
index 92e7c0e84..c6b292baa 100755
--- a/test/integration/test-compressed-indexes
+++ b/test/integration/test-compressed-indexes
@@ -61,9 +61,9 @@ testrun() {
cd downloaded
testsuccess --nomsg aptget download testpkg
msgtest '\tdeb file is present'; testsuccess --nomsg test -f testpkg_1.0_i386.deb
- rm testpkg_1.0_i386.deb
+ rm -f testpkg_1.0_i386.deb
cd - >/dev/null
- testequal 'Reading package lists...
+ testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
testpkg
@@ -71,14 +71,14 @@ The following NEW packages will be installed:
Inst testpkg (1.0 unstable [i386])
Conf testpkg (1.0 unstable [i386])' aptget install testpkg -s
rm -f rootdir/var/cache/apt/pkgcache.bin rootdir/var/cache/apt/srcpkgcache.bin
- testequal "$GOODSHOW" aptcache show testpkg
- testequal "$GOODSHOW" aptcache show testpkg
+ testsuccessequal "$GOODSHOW" aptcache show testpkg
+ testsuccessequal "$GOODSHOW" aptcache show testpkg
rm -f rootdir/var/cache/apt/pkgcache.bin rootdir/var/cache/apt/srcpkgcache.bin
- testequal "$GOODPOLICY" aptcache policy testpkg
- testequal "$GOODPOLICY" aptcache policy testpkg
+ testsuccessequal "$GOODPOLICY" aptcache policy testpkg
+ testsuccessequal "$GOODPOLICY" aptcache policy testpkg
rm -f rootdir/var/cache/apt/pkgcache.bin rootdir/var/cache/apt/srcpkgcache.bin
- testequal "$GOODSHOWSRC" aptcache showsrc testpkg
- testequal "$GOODSHOWSRC" aptcache showsrc testpkg
+ testsuccessequal "$GOODSHOWSRC" aptcache showsrc testpkg
+ testsuccessequal "$GOODSHOWSRC" aptcache showsrc testpkg
aptget clean
msgtest 'Check if the source is aptgetable'
cd downloaded
@@ -87,7 +87,7 @@ Conf testpkg (1.0 unstable [i386])' aptget install testpkg -s
testsuccess test -d testpkg-1.0
rm -rf testpkg-1.0*
cd - >/dev/null
- testequal "$(aptcache show testpkg -o Acquire::Languages=none)
+ testsuccessequal "$(aptcache show testpkg -o Acquire::Languages=none)
" aptcache dumpavail
}
@@ -134,14 +134,14 @@ testsuccess aptget update
GOODSHOW="$(aptcache show testpkg)
"
test $(echo "$GOODSHOW" | grep -e '^Package: testpkg' -e '^Version: 1.0' -e '^Architecture: i386' | wc -l) -eq 3 || msgdie 'show is broken'
-testequal "$GOODSHOW" aptcache show testpkg
+testsuccessequal "$GOODSHOW" aptcache show testpkg
GOODSHOWSRC="$(aptcache showsrc testpkg)
"
test $(echo "$GOODSHOWSRC" | grep -e '^Package: testpkg' -e '^Format: 3.0 (native)' -e '^Files:' -e '^Checksums-Sha256:' | wc -l) -eq 4 || msgdie 'showsrc is broken'
-testequal "$GOODSHOWSRC" aptcache showsrc testpkg
+testsuccessequal "$GOODSHOWSRC" aptcache showsrc testpkg
GOODPOLICY="$(aptcache policy testpkg)"
test $(echo "$GOODPOLICY" | grep -e '^testpkg:' -e '^ Candidate:' -e '^ Installed: (none)' -e '500 file:/' | wc -l) -eq 4 || msgdie 'policy is broken'
-testequal "$GOODPOLICY" aptcache policy testpkg
+testsuccessequal "$GOODPOLICY" aptcache policy testpkg
for COMPRESSOR in 'gzip' 'bzip2' 'lzma' 'xz'; do testovermethod 'file' $COMPRESSOR; done
@@ -150,7 +150,7 @@ rm -rf rootdir/var/lib/apt/lists
testsuccess aptget update
GOODPOLICY="$(aptcache policy testpkg)"
test $(echo "$GOODPOLICY" | grep -e '^testpkg:' -e '^ Candidate:' -e '^ Installed: (none)' -e '500 http://' | wc -l) -eq 4 || msgdie 'policy is broken'
-testequal "$GOODPOLICY" aptcache policy testpkg
+testsuccessequal "$GOODPOLICY" aptcache policy testpkg
for COMPRESSOR in 'gzip' 'bzip2' 'lzma' 'xz'; do testovermethod 'http' $COMPRESSOR; done
@@ -159,6 +159,6 @@ rm -rf rootdir/var/lib/apt/lists
testsuccess aptcdrom add </dev/null
GOODPOLICY="$(aptcache policy testpkg)"
test $(echo "$GOODPOLICY" | grep -e '^testpkg:' -e '^ Candidate:' -e '^ Installed: (none)' -e '500 cdrom://' | wc -l) -eq 4 || msgdie 'policy is broken'
-testequal "$GOODPOLICY" aptcache policy testpkg
+testsuccessequal "$GOODPOLICY" aptcache policy testpkg
for COMPRESSOR in 'gzip' 'bzip2' 'lzma' 'xz'; do testovermethod 'cdrom' $COMPRESSOR; done
diff --git a/test/integration/test-conflicts-loop b/test/integration/test-conflicts-loop
index 81731dfe4..729a5e0f8 100755
--- a/test/integration/test-conflicts-loop
+++ b/test/integration/test-conflicts-loop
@@ -15,7 +15,7 @@ insertpackage 'unstable' 'openjdk-6-jre-headless' 'i386' '6b20-1.9.8-0ubuntu1~10
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
diff --git a/test/integration/test-conflicts-real-multiarch-same b/test/integration/test-conflicts-real-multiarch-same
index d9111677c..e6c6c0e01 100755
--- a/test/integration/test-conflicts-real-multiarch-same
+++ b/test/integration/test-conflicts-real-multiarch-same
@@ -16,7 +16,7 @@ Conflicts: real-provider
Multi-Arch: same'
setupaptarchive
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Note, selecting 'virtual-provider' instead of 'virtual'
Note, selecting 'virtual-provider:i386' instead of 'virtual:i386'
@@ -28,7 +28,7 @@ Inst virtual-provider:i386 (2 unstable [i386])
Conf virtual-provider (2 unstable [amd64])
Conf virtual-provider:i386 (2 unstable [i386])" aptget install virtual:* -s -q=0
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
real real:i386
@@ -39,7 +39,7 @@ Conf real (2 unstable [amd64])
Conf real:i386 (2 unstable [i386])' aptget install real:* -s -q=0
# ensure that we are not confused by the provides
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
real-provider real-provider:i386
diff --git a/test/integration/test-cve-2013-1051-InRelease-parsing b/test/integration/test-cve-2013-1051-InRelease-parsing
index 8f9803991..933cbbd92 100755
--- a/test/integration/test-cve-2013-1051-InRelease-parsing
+++ b/test/integration/test-cve-2013-1051-InRelease-parsing
@@ -12,12 +12,12 @@ insertpackage 'stable' 'good-pkg' 'all' '1.0'
setupaptarchive
changetowebserver
-ARCHIVE='http://localhost:8080/'
+ARCHIVE='http://localhost:8080'
msgtest 'Initial apt-get update should work with' 'InRelease'
testsuccess --nomsg aptget update
# check that the setup is correct
-testequal "good-pkg:
+testsuccessequal "good-pkg:
Installed: (none)
Candidate: 1.0
Version table:
@@ -39,21 +39,26 @@ sed -i '/^-----BEGIN PGP SIGNATURE-----/,/^-----END PGP SIGNATURE-----/ s/^$/ /
cat aptarchive/dists/stable/Release >> aptarchive/dists/stable/InRelease
touch -d '+1hour' aptarchive/dists/stable/InRelease
-# ensure the update fails
-# useful for debugging to add "-o Debug::pkgAcquire::auth=true"
-msgtest 'apt-get update for should fail with the modified' 'InRelease'
-aptget update 2>&1 | grep -E -q '(Writing more data than expected|Hash Sum mismatch)' > /dev/null && msgpass || msgfail
+# ensure the update doesn't load bad data as good data
+# Note that we will pick up the InRelease itself as we download no other
+# indexes which would trigger a hashsum mismatch, but we ignore the 'bad'
+# part of the InRelease
+listcurrentlistsdirectory | sed '/_InRelease/ d' > listsdir.lst
+msgtest 'apt-get update should ignore unsigned data in the' 'InRelease'
+testsuccessequal "Get:1 http://localhost:8080 stable InRelease [$(stat -c%s aptarchive/dists/stable/InRelease) B]
+Reading package lists..." --nomsg aptget update
+testfileequal './listsdir.lst' "$(listcurrentlistsdirectory | sed '/_InRelease/ d')"
# ensure there is no package
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
E: Unable to locate package bad-mitm' aptget install bad-mitm -s
# and verify that its not picked up
-testequal 'N: Unable to locate package bad-mitm' aptcache policy bad-mitm -q=0
+testsuccessequal 'N: Unable to locate package bad-mitm' aptcache policy bad-mitm -q=0
# and that the right one is used
-testequal "good-pkg:
+testsuccessequal "good-pkg:
Installed: (none)
Candidate: 1.0
Version table:
diff --git a/test/integration/test-essential-force-loopbreak b/test/integration/test-essential-force-loopbreak
index 1493430d8..50c682d43 100755
--- a/test/integration/test-essential-force-loopbreak
+++ b/test/integration/test-essential-force-loopbreak
@@ -25,7 +25,7 @@ cp -a rootdir/var/lib/dpkg/status dpkg.status.backup
testforcebreak() {
cp -a dpkg.status.backup rootdir/var/lib/dpkg/status
rm -f rootdir/var/lib/apt/extended_states
- testequal "Reading package lists...
+ testfailureequal "Reading package lists...
Building dependency tree...
The following extra packages will be installed:
sysvinit
diff --git a/test/integration/test-external-dependency-solver-protocol b/test/integration/test-external-dependency-solver-protocol
index 07d2441b6..3b9b38c39 100755
--- a/test/integration/test-external-dependency-solver-protocol
+++ b/test/integration/test-external-dependency-solver-protocol
@@ -12,7 +12,10 @@ insertinstalledpackage 'stuff' 'all' '1'
insertpackage 'unstable' 'cool' 'all' '2' 'Multi-Arch: foreign'
insertpackage 'unstable' 'stuff' 'all' '2' 'Multi-Arch: foreign'
insertpackage 'unstable' 'coolstuff' 'i386,amd64' '2' 'Depends: cool, stuff'
-insertpackage 'unstable' 'awesome' 'all' '2' 'Multi-Arch: foreign'
+insertpackage 'unstable' 'awesome' 'all' '2' 'Multi-Arch: foreign
+Conflicts: badstuff'
+insertpackage 'unstable' 'badstuff' 'all' '2' 'Multi-Arch: foreign
+Conflicts: awesome'
insertpackage 'unstable' 'awesomecoolstuff' 'i386' '2' 'Depends: coolstuff, awesome'
insertpackage 'experimental' 'cool' 'all' '3' 'Multi-Arch: foreign'
@@ -22,7 +25,7 @@ insertpackage 'experimental' 'coolstuff' 'i386,amd64' '3' 'Depends: cool, stuff'
setupaptarchive
rm -f /tmp/dump.edsp
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Execute external solver...
The solver encountered an error of type: ERR_JUST_DUMPING
@@ -35,7 +38,7 @@ testsuccess test -s /tmp/dump.edsp
rm -f /tmp/dump.edsp
#FIXME: this should be unstable, but we don't support pinning yet
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Execute external solver...
The following NEW packages will be installed:
@@ -44,6 +47,14 @@ The following NEW packages will be installed:
Inst coolstuff (3 experimental [amd64])
Conf coolstuff (3 experimental [amd64])' aptget install --solver apt coolstuff -s
+testsuccessequal 'Reading package lists...
+Building dependency tree...
+Execute external solver...
+The following packages will be REMOVED:
+ cool*
+0 upgraded, 0 newly installed, 1 to remove and 1 not upgraded.
+Purg cool [1]' aptget purge --solver apt cool -s
+
testsuccess aptget install awesomecoolstuff:i386 -s
testsuccess aptget install --solver apt awesomecoolstuff:i386 -s
@@ -57,9 +68,13 @@ testsuccess aptget dist-upgrade -s --solver apt
testsuccess aptget upgrade -s
testsuccess aptget upgrade -s --solver apt
+testfailure aptget install awesome badstuff -s
+testfailure aptget install awesome badstuff -s --solver apt
+testsuccess grep 'ERR_UNSOLVABLE' rootdir/tmp/testfailure.output
+
configarchitecture 'armel'
msgtest 'Test direct calling is okay for' 'apt-internal-solver'
-cat /tmp/dump.edsp | aptinternalsolver > solver.result 2>&1 || true
+cat /tmp/dump.edsp | aptinternalsolver -q=0 > solver.result 2>&1 || true
if [ "$(tail -n2 solver.result | head -n1 )" = "Message: Done" ]; then
msgpass
else
@@ -69,3 +84,16 @@ fi
rm -f /tmp/dump.edsp
testfailure aptget install --solver apt awesomecoolstuff:i386 -s
+
+testsuccess aptinternalsolver scenario
+testsuccessequal 'Package: stuff
+Source: stuff
+Architecture: all
+Version: 1
+Installed: yes
+APT-ID: 2
+Priority: optional
+Section: other
+APT-Pin: 100
+APT-Candidate: yes
+' aptinternalsolver scenario stuff
diff --git a/test/integration/test-failing-maintainer-scripts b/test/integration/test-failing-maintainer-scripts
index 3dd7d643e..953506aa5 100755
--- a/test/integration/test-failing-maintainer-scripts
+++ b/test/integration/test-failing-maintainer-scripts
@@ -6,6 +6,7 @@ TESTDIR=$(readlink -f $(dirname $0))
setupenvironment
configarchitecture 'native'
+configdpkgnoopchroot
# create a bunch of failures
createfailure() {
@@ -25,51 +26,6 @@ createfailure 'postrm'
setupaptarchive
-# create a library to noop chroot() and rewrite maintainer script executions
-# via execvp() as used by dpkg as we don't want our rootdir to be a fullblown
-# chroot directory dpkg could chroot into to execute the maintainer scripts
-cat << EOF > noopchroot.c
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <dlfcn.h>
-
-static char * chrootdir = NULL;
-
-int chroot(const char *path) {
- printf("WARNING: CHROOTing to %s was ignored!\n", path);
- free(chrootdir);
- chrootdir = strdup(path);
- return 0;
-}
-int execvp(const char *file, char *const argv[]) {
- static int (*func_execvp) (const char *, char * const []) = NULL;
- if (func_execvp == NULL)
- func_execvp = (int (*) (const char *, char * const [])) dlsym(RTLD_NEXT, "execvp");
- if (chrootdir == NULL || strncmp(file, "/var/lib/dpkg/", strlen("/var/lib/dpkg/")) != 0)
- return func_execvp(file, argv);
- printf("REWRITE execvp call %s into %s\n", file, chrootdir);
- char newfile[strlen(chrootdir) + strlen(file)];
- strcpy(newfile, chrootdir);
- strcat(newfile, file);
- return func_execvp(newfile, argv);
-}
-EOF
-testsuccess gcc -fPIC -shared -o noopchroot.so noopchroot.c -ldl
-
-mkdir -p "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/"
-DPKG="${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg"
-echo "#!/bin/sh
-if [ -n \"\$LD_PRELOAD\" ]; then
- export LD_PRELOAD=\"${TMPWORKINGDIRECTORY}/noopchroot.so \${LD_PRELOAD}\"
-else
- export LD_PRELOAD=\"${TMPWORKINGDIRECTORY}/noopchroot.so\"
-fi
-dpkg \"\$@\"" > $DPKG
-chmod +x $DPKG
-sed -ie "s|^DPKG::options:: \"dpkg\";\$|DPKG::options:: \"$DPKG\";|" aptconfig.conf
-
# setup some pre- and post- invokes to check the output isn't garbled later
APTHOOK="${TMPWORKINGDIRECTORY}/rootdir/usr/bin/apthook"
echo '#!/bin/sh
diff --git a/test/integration/test-handling-broken-orgroups b/test/integration/test-handling-broken-orgroups
index 20b314074..149f05fa9 100755
--- a/test/integration/test-handling-broken-orgroups
+++ b/test/integration/test-handling-broken-orgroups
@@ -23,7 +23,7 @@ Provides: stuff-abi-2'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
cool
@@ -35,7 +35,7 @@ Inst coolstuff (1.0-1 unstable [all])
Conf cool (1.0-1 unstable [all])
Conf coolstuff (1.0-1 unstable [all])' aptget install coolstuff -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
stuff
@@ -47,7 +47,7 @@ Inst coolstuff2 (1.0-1 unstable [all])
Conf stuff (1.0-1 unstable [all])
Conf coolstuff2 (1.0-1 unstable [all])' aptget install coolstuff2 -s
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
@@ -60,7 +60,7 @@ The following packages have unmet dependencies:
stuff2 but it is not installable
E: Unable to correct problems, you have held broken packages.' aptget install coolstuff-broken -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Recommended packages:
cool2 stuff2
@@ -70,7 +70,7 @@ The following NEW packages will be installed:
Inst coolstuff-brokenrec (1.0-1 unstable [all])
Conf coolstuff-brokenrec (1.0-1 unstable [all])' aptget install coolstuff-brokenrec -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
stuff
@@ -82,7 +82,7 @@ Inst coolstuff-conflict (1.0-1 unstable [all])
Conf stuff (1.0-1 unstable [all])
Conf coolstuff-conflict (1.0-1 unstable [all])' aptget install coolstuff-conflict -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
extrastuff
@@ -94,7 +94,7 @@ Inst coolstuff-provided (1.0-1 unstable [all])
Conf extrastuff (1.0-1 unstable [all])
Conf coolstuff-provided (1.0-1 unstable [all])' aptget install coolstuff-provided -s
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
diff --git a/test/integration/test-ignore-provides-if-versioned-breaks b/test/integration/test-ignore-provides-if-versioned-breaks
index 745f7d206..20424b942 100755
--- a/test/integration/test-ignore-provides-if-versioned-breaks
+++ b/test/integration/test-ignore-provides-if-versioned-breaks
@@ -33,7 +33,7 @@ insertpackage 'unstable' 'foo-same-breaker-none' 'i386' '1.0' 'Breaks: foo-same'
setupaptarchive
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
@@ -45,7 +45,7 @@ The following packages have unmet dependencies:
foo-breaker-none : Breaks: foo
E: Unable to correct problems, you have held broken packages.' aptget install foo-provider foo-breaker-none -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo-breaker-2 foo-provider
@@ -55,7 +55,7 @@ Inst foo-provider (1.0 unstable [i386])
Conf foo-breaker-2 (1.0 unstable [i386])
Conf foo-provider (1.0 unstable [i386])' aptget install foo-provider foo-breaker-2 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
foo
@@ -71,7 +71,7 @@ Conf foo (4.0 unstable [i386])
Conf foo-breaker-3 (1.0 unstable [i386])
Conf foo-provider (1.0 unstable [i386])' aptget install foo-provider foo-breaker-3 -s
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
@@ -83,7 +83,7 @@ The following packages have unmet dependencies:
foo-foreign-breaker-none : Breaks: foo-foreign
E: Unable to correct problems, you have held broken packages.' aptget install foo-foreign-provider foo-foreign-breaker-none -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo-foreign-breaker-2 foo-foreign-provider
@@ -93,7 +93,7 @@ Inst foo-foreign-provider (1.0 unstable [i386])
Conf foo-foreign-breaker-2 (1.0 unstable [i386])
Conf foo-foreign-provider (1.0 unstable [i386])' aptget install foo-foreign-provider foo-foreign-breaker-2 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
foo-foreign:amd64
@@ -109,7 +109,7 @@ Conf foo-foreign:amd64 (4.0 unstable [amd64])
Conf foo-foreign-breaker-3 (1.0 unstable [i386])
Conf foo-foreign-provider (1.0 unstable [i386])' aptget install foo-foreign-provider foo-foreign-breaker-3 -s
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
@@ -121,7 +121,7 @@ The following packages have unmet dependencies:
foo-same-breaker-none : Breaks: foo-same
E: Unable to correct problems, you have held broken packages.' aptget install foo-same-provider foo-same-breaker-none -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo-same-breaker-2 foo-same-provider
@@ -131,7 +131,7 @@ Inst foo-same-provider (1.0 unstable [i386])
Conf foo-same-breaker-2 (1.0 unstable [i386])
Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider foo-same-breaker-2 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
foo-same:amd64 foo-same
diff --git a/test/integration/test-ignore-provides-if-versioned-conflicts b/test/integration/test-ignore-provides-if-versioned-conflicts
index a07252768..a781d8e44 100755
--- a/test/integration/test-ignore-provides-if-versioned-conflicts
+++ b/test/integration/test-ignore-provides-if-versioned-conflicts
@@ -33,7 +33,7 @@ insertpackage 'unstable' 'foo-same-breaker-none' 'i386' '1.0' 'Conflicts: foo-sa
setupaptarchive
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
@@ -45,7 +45,7 @@ The following packages have unmet dependencies:
foo-breaker-none : Conflicts: foo
E: Unable to correct problems, you have held broken packages.' aptget install foo-provider foo-breaker-none -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo-breaker-2 foo-provider
@@ -55,7 +55,7 @@ Inst foo-provider (1.0 unstable [i386])
Conf foo-breaker-2 (1.0 unstable [i386])
Conf foo-provider (1.0 unstable [i386])' aptget install foo-provider foo-breaker-2 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
foo
@@ -71,7 +71,7 @@ Conf foo (4.0 unstable [i386])
Conf foo-breaker-3 (1.0 unstable [i386])
Conf foo-provider (1.0 unstable [i386])' aptget install foo-provider foo-breaker-3 -s
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
@@ -83,7 +83,7 @@ The following packages have unmet dependencies:
foo-foreign-breaker-none : Conflicts: foo-foreign
E: Unable to correct problems, you have held broken packages.' aptget install foo-foreign-provider foo-foreign-breaker-none -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo-foreign-breaker-2 foo-foreign-provider
@@ -93,7 +93,7 @@ Inst foo-foreign-provider (1.0 unstable [i386])
Conf foo-foreign-breaker-2 (1.0 unstable [i386])
Conf foo-foreign-provider (1.0 unstable [i386])' aptget install foo-foreign-provider foo-foreign-breaker-2 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
foo-foreign:amd64
@@ -109,7 +109,7 @@ Conf foo-foreign:amd64 (4.0 unstable [amd64])
Conf foo-foreign-breaker-3 (1.0 unstable [i386])
Conf foo-foreign-provider (1.0 unstable [i386])' aptget install foo-foreign-provider foo-foreign-breaker-3 -s
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
@@ -121,7 +121,7 @@ The following packages have unmet dependencies:
foo-same-breaker-none : Conflicts: foo-same
E: Unable to correct problems, you have held broken packages.' aptget install foo-same-provider foo-same-breaker-none -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo-same-breaker-2 foo-same-provider
@@ -131,7 +131,7 @@ Inst foo-same-provider (1.0 unstable [i386])
Conf foo-same-breaker-2 (1.0 unstable [i386])
Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider foo-same-breaker-2 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
foo-same:amd64 foo-same
diff --git a/test/integration/test-implicit-conflicts-real-not-virtual b/test/integration/test-implicit-conflicts-real-not-virtual
index c9fca4edf..7c1365bdd 100755
--- a/test/integration/test-implicit-conflicts-real-not-virtual
+++ b/test/integration/test-implicit-conflicts-real-not-virtual
@@ -17,7 +17,7 @@ insertinstalledpackage 'wireless-crda' 'amd64' '1.14'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
crda
@@ -25,7 +25,7 @@ The following NEW packages will be installed:
Inst crda (1.1.1-1ubuntu4m unstable-m [amd64])
Conf crda (1.1.1-1ubuntu4m unstable-m [amd64])' aptget install crda -s -t unstable-m
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
crda
@@ -33,7 +33,7 @@ The following NEW packages will be installed:
Inst crda (1.1.1-1ubuntu4p unstable-p [amd64])
Conf crda (1.1.1-1ubuntu4p unstable-p [amd64])' aptget install crda -s -t unstable-p
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
crda
@@ -47,7 +47,7 @@ Conflicts: wireless-crda (<< 1.15)
Replaces: wireless-crda ( << 1.15)
Multi-arch: foreign'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
wireless-crda
diff --git a/test/integration/test-kernel-helper-autoremove b/test/integration/test-kernel-helper-autoremove
index 22c36890b..c2fc37ee7 100755
--- a/test/integration/test-kernel-helper-autoremove
+++ b/test/integration/test-kernel-helper-autoremove
@@ -26,13 +26,6 @@ insertinstalledpackage 'linux-headers-1000000-1-generic' 'amd64' '100.0.0-1'
testsuccess aptmark auto "$CURRENTKERNEL" 'linux-image-1.0.0-2-generic' 'linux-image-100.0.0-1-generic' 'linux-headers-1000000-1-generic'
-cat > ./fake-dpkg <<EOF
-#!/bin/sh
-exec $(aptconfig dump --no-empty --format='%v ' 'DPKG::options') "\$@"
-EOF
-chmod +x ./fake-dpkg
-echo 'Dir::Bin::dpkg "./fake-dpkg";' > rootdir/etc/apt/apt.conf.d/99fakedpkg
-
# install fake-dpkg into it
catfail() {
echo >&2
@@ -62,7 +55,7 @@ testprotected() {
grep -q "^\\^linux-image-$(uname -r | sed -e 's#\.#\\\\.#g')\\\$\$" protected.list && msgpass || catfail
}
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Reading state information...
The following packages will be REMOVED:
@@ -80,7 +73,7 @@ testprotected
msgtest 'Check kernel autoremoval protection list does not include' 'old kernel'
grep -q '^\^linux-image-1\\\.0\\\.0-2-generic\$$' protected.list && catfail || msgpass
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following packages will be REMOVED:
@@ -92,7 +85,7 @@ Remv linux-image-1.0.0-2-generic [1.0.0-2]' aptget autoremove -s
testprotected 1.0.0-2-generic
msgtest 'Check kernel autoremoval protection list includes' 'installed kernel'
grep -q '^\^linux-image-1\\\.0\\\.0-2-generic\$$' protected.list && msgpass || catfail
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
The following packages will be REMOVED:
diff --git a/test/integration/test-method-rred b/test/integration/test-method-rred
new file mode 100755
index 000000000..a8de3ea28
--- /dev/null
+++ b/test/integration/test-method-rred
@@ -0,0 +1,194 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'i386'
+
+echo 'Package: coolstuff
+Version: 0.8.15
+Description: collection of stuff
+ A lot, too much to iterate all, but at least this:
+ - stuff
+ - more stuff
+ - even more stuff
+ .
+ And a cow.
+
+Package: oldstuff
+Version: 0-1
+Description: collection of outdated stuff
+ A lot, but of no use nowadays, but at least this:
+ - stuff
+ - more stuff
+ - even more stuff
+ .
+ And a dog.' > Packages
+
+testrred() {
+ msgtest "$1" "$2"
+ if [ -z "$3" ]; then
+ echo -n '' > Packages.ed
+ else
+ echo "$3" > Packages.ed
+ fi
+ rred() {
+ cat Packages | runapt "${METHODSDIR}/rred" "$@"
+ }
+ testsuccessequal "$4" --nomsg rred -f Packages.ed
+}
+
+testrred 'Remove' 'first line' '1d' "$(tail -n +2 ./Packages)"
+testrred 'Remove' 'empty line' '10d' "$(head -n 9 ./Packages)
+$(tail -n 9 ./Packages)"
+testrred 'Remove' 'line in a paragraph' '5d' "$(head -n 4 ./Packages)
+$(tail -n 14 ./Packages)"
+testrred 'Remove' 'last line' '19d' "$(head -n -1 ./Packages)"
+testrred 'Remove' 'multiple single lines' '17d
+7d' "$(sed -e '/^ - even more stuff$/ d' ./Packages)"
+testrred 'Remove' 'first paragraph' '1,10d' "$(tail -n 9 ./Packages)"
+testrred 'Remove' 'a few lines in the middle' '5,14d' "$(head -n 4 ./Packages)
+$(tail -n 5 ./Packages)"
+testrred 'Remove' 'second paragraph' '10,19d' "$(head -n 9 ./Packages)"
+testrred 'Mass Remove' 'all stuff lines' '15,17d
+13d
+11d
+5,7d
+3d
+1d' "$(sed '/stuff/ d' ./Packages)"
+
+testrred 'Single line add' 'first line' '0a
+Format: 3.0 (native)
+.' "Format: 3.0 (native)
+$(cat ./Packages)"
+testrred 'Single line add' 'last line' '19a
+Multi-Arch: foreign
+.' "$(cat ./Packages)
+Multi-Arch: foreign"
+testrred 'Single line add' 'middle' '9a
+Multi-Arch: foreign
+.' "$(head -n 9 ./Packages)
+Multi-Arch: foreign
+$(tail -n 10 ./Packages)"
+
+testrred 'Multi line add' 'first line' '0a
+Format: 3.0 (native)
+Source: apt
+.' "Format: 3.0 (native)
+Source: apt
+$(cat ./Packages)"
+testrred 'Multi line add' 'last line' '19a
+Multi-Arch: foreign
+Homepage: https://debian.org
+.' "$(cat ./Packages)
+Multi-Arch: foreign
+Homepage: https://debian.org"
+testrred 'Multi line add' 'middle' '9a
+Multi-Arch: foreign
+Homepage: https://debian.org
+.' "$(head -n 9 ./Packages)
+Multi-Arch: foreign
+Homepage: https://debian.org
+$(tail -n 10 ./Packages)"
+
+testrred 'Single line change' 'first line' '1c
+Package: supercoolstuff
+.' "Package: supercoolstuff
+$(tail -n +2 ./Packages)"
+testrred 'Single line change' 'in the middle' '9c
+ And a super cow.
+.' "$(head -n 8 ./Packages)
+ And a super cow.
+$(tail -n 10 ./Packages)"
+testrred 'Single line change' 'an empty line' '10c
+
+.' "$(head -n 9 ./Packages)
+
+$(tail -n 9 ./Packages)"
+testrred 'Single line change' 'a spacy line' '10c
+
+.' "$(head -n 9 ./Packages)
+
+$(tail -n 9 ./Packages)"
+testrred 'Single line change' 'last line' '19c
+ And a cat.
+.' "$(head -n -1 ./Packages)
+ And a cat."
+
+testrred 'Multi line change' 'exchange' '5,7c
+ - good stuff
+ - more good stuff
+ - even more good stuff
+.' "$(head -n 4 ./Packages)
+ - good stuff
+ - more good stuff
+ - even more good stuff
+$(tail -n 12 ./Packages)"
+testrred 'Multi line change' 'less' '5,7c
+ - good stuff
+ - more good stuff
+.' "$(head -n 4 ./Packages)
+ - good stuff
+ - more good stuff
+$(tail -n 12 ./Packages)"
+testrred 'Multi line change' 'more' '5,7c
+ - good stuff
+ - more good stuff
+ - even more good stuff
+ - bonus good stuff
+.' "$(head -n 4 ./Packages)
+ - good stuff
+ - more good stuff
+ - even more good stuff
+ - bonus good stuff
+$(tail -n 12 ./Packages)"
+
+failrred() {
+ msgtest 'Failure caused by' "$1"
+ echo "$2" > Packages.ed
+ rred() {
+ cat Packages | runapt "${METHODSDIR}/rred" "$@"
+ }
+ testfailure --nomsg rred -f Packages.ed
+}
+
+failrred 'Bogus content' '<html>
+</html>'
+
+# not a problem per-se, but we want our parser to be really strict
+failrred 'Empty patch file' ''
+failrred 'Empty line patch file' '
+'
+failrred 'Empty line before command' '
+1d'
+failrred 'Empty line after command' '1d
+'
+failrred 'Empty line between commands' '17d
+
+7d'
+failrred 'Empty spaces lines before command' '
+1d'
+failrred 'Empty spaces lines after command' '1d
+ '
+failrred 'Empty spaces lines between commands' '17d
+
+7d'
+
+# the line before the first one can't be deleted/changed
+failrred 'zero line delete' '0d'
+failrred 'zero line change' '0c
+Package: supercoolstuff
+.'
+# and this makes no sense at all
+failrred 'negative line delete' '-1d'
+failrred 'negative line change' '-1c
+Package: supercoolstuff
+.'
+failrred 'negative line add' '-1a
+Package: supercoolstuff
+.'
+failrred 'Wrong order of commands' '7d
+17d'
+failrred 'End before start' '7,6d'
diff --git a/test/integration/test-multiarch-foreign b/test/integration/test-multiarch-foreign
index 332466d96..7870126f5 100755
--- a/test/integration/test-multiarch-foreign
+++ b/test/integration/test-multiarch-foreign
@@ -7,15 +7,19 @@ setupenvironment
configarchitecture 'amd64' 'i386' 'armel'
insertpackage 'unstable' 'cool-foo' 'amd64,i386' '1.0' 'Depends: foo'
+insertpackage 'unstable' 'cool-foo-x64' 'amd64' '1.0' 'Depends: foo:amd64'
+insertpackage 'unstable' 'cool-foo-x32' 'amd64' '1.0' 'Depends: foo:i386'
insertpackage 'unstable' 'foo' 'amd64,i386,armel' '1.0' 'Multi-Arch: foreign'
insertpackage 'unstable' 'cool-bar' 'amd64,i386' '1.0' 'Depends: bar-provider'
+insertpackage 'unstable' 'cool-bar-x64' 'amd64' '1.0' 'Depends: bar-provider:amd64'
+insertpackage 'unstable' 'cool-bar-x32' 'amd64' '1.0' 'Depends: bar-provider:i386'
insertpackage 'unstable' 'bar' 'amd64,i386,armel' '1.0' 'Provides: bar-provider
Multi-Arch: foreign'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
foo
@@ -27,29 +31,7 @@ Inst cool-foo:i386 (1.0 unstable [i386])
Conf foo (1.0 unstable [amd64])
Conf cool-foo:i386 (1.0 unstable [i386])' aptget install cool-foo:i386 -s
-testequal 'Reading package lists...
-Building dependency tree...
-The following extra packages will be installed:
- foo
-The following NEW packages will be installed:
- cool-foo foo
-0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
-Inst foo (1.0 unstable [amd64])
-Inst cool-foo (1.0 unstable [amd64])
-Conf foo (1.0 unstable [amd64])
-Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 -s
-
-testequal 'Reading package lists...
-Building dependency tree...
-The following NEW packages will be installed:
- cool-foo foo
-0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
-Inst foo (1.0 unstable [amd64])
-Inst cool-foo (1.0 unstable [amd64])
-Conf foo (1.0 unstable [amd64])
-Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:amd64 -s
-
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
cool-foo foo:i386
@@ -59,7 +41,7 @@ Inst cool-foo (1.0 unstable [amd64])
Conf foo:i386 (1.0 unstable [i386])
Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:i386 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
cool-foo foo:armel
@@ -69,11 +51,7 @@ Inst cool-foo (1.0 unstable [amd64])
Conf foo:armel (1.0 unstable [armel])
Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:armel -s
-
-
-
-
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
bar
@@ -85,7 +63,61 @@ Inst cool-bar:i386 (1.0 unstable [i386])
Conf bar (1.0 unstable [amd64])
Conf cool-bar:i386 (1.0 unstable [i386])' aptget install cool-bar:i386 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ bar:i386 cool-bar
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst bar:i386 (1.0 unstable [i386])
+Inst cool-bar (1.0 unstable [amd64])
+Conf bar:i386 (1.0 unstable [i386])
+Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 bar:i386 -s
+
+testsuccessequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ bar:armel cool-bar
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst bar:armel (1.0 unstable [armel])
+Inst cool-bar (1.0 unstable [amd64])
+Conf bar:armel (1.0 unstable [armel])
+Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 bar:armel -s
+
+testsuccessequal "Reading package lists...
+Building dependency tree...
+Note, selecting 'bar:i386' instead of 'bar-provider:i386'
+The following NEW packages will be installed:
+ bar:i386 cool-bar
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst bar:i386 (1.0 unstable [i386])
+Inst cool-bar (1.0 unstable [amd64])
+Conf bar:i386 (1.0 unstable [i386])
+Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider:i386 -s -q=0
+
+satisfiable_in_singlearch() {
+ testsuccessequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+ foo
+The following NEW packages will be installed:
+ cool-foo foo
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1.0 unstable [amd64])
+Inst cool-foo (1.0 unstable [amd64])
+Conf foo (1.0 unstable [amd64])
+Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 -s
+
+ testsuccessequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ cool-foo foo
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1.0 unstable [amd64])
+Inst cool-foo (1.0 unstable [amd64])
+Conf foo (1.0 unstable [amd64])
+Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:amd64 -s
+
+ testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
bar
@@ -97,7 +129,7 @@ Inst cool-bar (1.0 unstable [amd64])
Conf bar (1.0 unstable [amd64])
Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 -s
-testequal 'Reading package lists...
+ testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
bar cool-bar
@@ -107,44 +139,71 @@ Inst cool-bar (1.0 unstable [amd64])
Conf bar (1.0 unstable [amd64])
Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 bar:amd64 -s
-testequal 'Reading package lists...
+ testsuccessequal "Reading package lists...
Building dependency tree...
+Note, selecting 'bar' instead of 'bar-provider'
The following NEW packages will be installed:
- bar:i386 cool-bar
+ bar cool-bar
0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
-Inst bar:i386 (1.0 unstable [i386])
+Inst bar (1.0 unstable [amd64])
Inst cool-bar (1.0 unstable [amd64])
-Conf bar:i386 (1.0 unstable [i386])
-Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 bar:i386 -s
+Conf bar (1.0 unstable [amd64])
+Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider -s -q=0
-testequal 'Reading package lists...
+ testsuccessequal 'Reading package lists...
Building dependency tree...
+The following extra packages will be installed:
+ foo
The following NEW packages will be installed:
- bar:armel cool-bar
+ cool-foo-x64 foo
0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
-Inst bar:armel (1.0 unstable [armel])
-Inst cool-bar (1.0 unstable [amd64])
-Conf bar:armel (1.0 unstable [armel])
-Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 bar:armel -s
+Inst foo (1.0 unstable [amd64])
+Inst cool-foo-x64 (1.0 unstable [amd64])
+Conf foo (1.0 unstable [amd64])
+Conf cool-foo-x64 (1.0 unstable [amd64])' aptget install cool-foo-x64 -s
+}
-testequal "Reading package lists...
+#FIXME: do not work in single-arch as i386 isn't known at cache generation time
+ testsuccessequal 'Reading package lists...
Building dependency tree...
-Note, selecting 'bar' instead of 'bar-provider'
+The following extra packages will be installed:
+ foo
The following NEW packages will be installed:
- bar cool-bar
+ cool-foo-x32 foo
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1.0 unstable [amd64])
+Inst cool-foo-x32 (1.0 unstable [amd64])
+Conf foo (1.0 unstable [amd64])
+Conf cool-foo-x32 (1.0 unstable [amd64])' aptget install cool-foo-x32 -s
+
+ testsuccessequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+ bar
+The following NEW packages will be installed:
+ bar cool-bar-x32
0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
Inst bar (1.0 unstable [amd64])
-Inst cool-bar (1.0 unstable [amd64])
+Inst cool-bar-x32 (1.0 unstable [amd64])
Conf bar (1.0 unstable [amd64])
-Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider -s -q=0
+Conf cool-bar-x32 (1.0 unstable [amd64])' aptget install cool-bar-x32 -s -q=0
-testequal "Reading package lists...
+ testsuccessequal 'Reading package lists...
Building dependency tree...
-Note, selecting 'bar:i386' instead of 'bar-provider:i386'
+The following extra packages will be installed:
+ bar
The following NEW packages will be installed:
- bar:i386 cool-bar
+ bar cool-bar-x64
0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
-Inst bar:i386 (1.0 unstable [i386])
-Inst cool-bar (1.0 unstable [amd64])
-Conf bar:i386 (1.0 unstable [i386])
-Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider:i386 -s -q=0
+Inst bar (1.0 unstable [amd64])
+Inst cool-bar-x64 (1.0 unstable [amd64])
+Conf bar (1.0 unstable [amd64])
+Conf cool-bar-x64 (1.0 unstable [amd64])' aptget install cool-bar-x64 -s -q=0
+
+
+satisfiable_in_singlearch
+
+msgmsg 'switch to single architecture'
+configarchitecture 'amd64'
+
+satisfiable_in_singlearch
diff --git a/test/integration/test-no-fds-leaked-to-maintainer-scripts b/test/integration/test-no-fds-leaked-to-maintainer-scripts
new file mode 100755
index 000000000..41c057042
--- /dev/null
+++ b/test/integration/test-no-fds-leaked-to-maintainer-scripts
@@ -0,0 +1,119 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+
+setupenvironment
+configarchitecture 'amd64' 'i386'
+configdpkgnoopchroot
+
+setupsimplenativepackage "fdleaks" 'all' '1.0' 'unstable'
+BUILDDIR="incoming/fdleaks-1.0"
+for script in 'preinst' 'postinst' 'prerm' 'postrm'; do
+ cat > ${BUILDDIR}/debian/$script << EOF
+#!/bin/sh
+if [ -e "$(pwd)/rootdir/tmp/read_stdin" ]; then
+ read line;
+ echo "STDIN: -\$line-"
+fi
+ls -l /proc/self/fd/
+EOF
+done
+buildpackage "$BUILDDIR" 'unstable' 'main' 'native'
+rm -rf "$BUILDDIR"
+
+PKGNAME='fdleaks:all'
+if ! dpkg-checkbuilddeps -d 'dpkg (>= 1.16.2)' /dev/null >/dev/null 2>&1; then
+ PKGNAME='fdleaks'
+fi
+
+setupaptarchive
+
+rm -f rootdir/var/log/dpkg.log rootdir/var/log/apt/term.log
+testsuccess aptget install -y fdleaks -qq < /dev/null
+
+checkfdleak() {
+ msgtest 'Check if fds were not' 'leaked'
+ if [ "$(grep 'root root' rootdir/tmp/testsuccess.output | wc -l)" = "$1" ]; then
+ msgpass
+ else
+ echo
+ cat rootdir/tmp/testsuccess.output
+ msgfail
+ fi
+}
+checkinstall() {
+ checkfdleak 8
+
+ cp rootdir/tmp/testsuccess.output terminal.output
+ tail -n +3 rootdir/var/log/apt/term.log | head -n -1 > terminal.log
+ testfileequal 'terminal.log' "$(cat terminal.output)"
+
+ testequal "startup archives unpack
+install $PKGNAME <none> 1.0
+status half-installed $PKGNAME 1.0
+status unpacked $PKGNAME 1.0
+status unpacked $PKGNAME 1.0
+startup packages configure
+configure $PKGNAME 1.0 <none>
+status unpacked $PKGNAME 1.0
+status half-configured $PKGNAME 1.0
+status installed $PKGNAME 1.0
+startup packages configure" cut -f 3- -d' ' rootdir/var/log/dpkg.log
+}
+checkinstall
+
+rm -f rootdir/var/log/dpkg.log rootdir/var/log/apt/term.log
+testsuccess aptget purge -y fdleaks -qq
+checkpurge() {
+ checkfdleak 12
+
+ cp rootdir/tmp/testsuccess.output terminal.output
+ tail -n +3 rootdir/var/log/apt/term.log | head -n -1 > terminal.log
+ testfileequal 'terminal.log' "$(cat terminal.output)"
+
+ testequal "startup packages purge
+status installed $PKGNAME 1.0
+remove $PKGNAME 1.0 <none>
+status half-configured $PKGNAME 1.0
+status half-installed $PKGNAME 1.0
+status config-files $PKGNAME 1.0
+purge $PKGNAME 1.0 <none>
+status config-files $PKGNAME 1.0
+status config-files $PKGNAME 1.0
+status config-files $PKGNAME 1.0
+status config-files $PKGNAME 1.0
+status config-files $PKGNAME 1.0
+status not-installed $PKGNAME <none>
+startup packages configure" cut -f 3- -d' ' rootdir/var/log/dpkg.log
+}
+checkpurge
+
+msgtest 'setsid provided is new enough to support' '-w'
+if dpkg-checkbuilddeps -d 'util-linux (>= 2.24.2-1)' /dev/null >/dev/null 2>&1; then
+ msgpass
+else
+ msgskip "$(command dpkg -l util-linux)"
+ exit
+fi
+
+rm -f rootdir/var/log/dpkg.log rootdir/var/log/apt/term.log
+testsuccess runapt command setsid -w "${BUILDDIRECTORY}/apt-get" install -y fdleaks -qq < /dev/null
+checkinstall
+
+rm -f rootdir/var/log/dpkg.log rootdir/var/log/apt/term.log
+testsuccess runapt command setsid -w "${BUILDDIRECTORY}/apt-get" purge -y fdleaks -qq
+checkpurge
+
+touch rootdir/tmp/read_stdin
+
+rm -f rootdir/var/log/dpkg.log rootdir/var/log/apt/term.log
+for i in $(seq 1 10); do echo "$i"; done | testsuccess aptget install -y fdleaks -qq
+checkinstall
+testequal '2' grep -c '^STDIN: ' rootdir/var/log/apt/term.log
+
+rm -f rootdir/var/log/dpkg.log rootdir/var/log/apt/term.log
+yes '' | testsuccess runapt command setsid -w "${BUILDDIRECTORY}/apt-get" purge -y fdleaks -qq
+checkpurge
+testequal '3' grep -c '^STDIN: ' rootdir/var/log/apt/term.log
diff --git a/test/integration/test-ordering-ignore-not-matching-breaks b/test/integration/test-ordering-ignore-not-matching-breaks
index c9fca4edf..7c1365bdd 100755
--- a/test/integration/test-ordering-ignore-not-matching-breaks
+++ b/test/integration/test-ordering-ignore-not-matching-breaks
@@ -17,7 +17,7 @@ insertinstalledpackage 'wireless-crda' 'amd64' '1.14'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
crda
@@ -25,7 +25,7 @@ The following NEW packages will be installed:
Inst crda (1.1.1-1ubuntu4m unstable-m [amd64])
Conf crda (1.1.1-1ubuntu4m unstable-m [amd64])' aptget install crda -s -t unstable-m
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
crda
@@ -33,7 +33,7 @@ The following NEW packages will be installed:
Inst crda (1.1.1-1ubuntu4p unstable-p [amd64])
Conf crda (1.1.1-1ubuntu4p unstable-p [amd64])' aptget install crda -s -t unstable-p
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
crda
@@ -47,7 +47,7 @@ Conflicts: wireless-crda (<< 1.15)
Replaces: wireless-crda ( << 1.15)
Multi-arch: foreign'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
wireless-crda
diff --git a/test/integration/test-package-reinstallation b/test/integration/test-package-reinstallation
index b4f2061ec..f0412f98d 100755
--- a/test/integration/test-package-reinstallation
+++ b/test/integration/test-package-reinstallation
@@ -14,7 +14,7 @@ insertinstalledpackage 'apt' 'i386' '0.8.15' 'Depends: libc6'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
0 upgraded, 0 newly installed, 2 reinstalled, 0 to remove and 0 not upgraded.
Inst libc-bin [2.13-8] (2.13-8 unstable [i386])
diff --git a/test/integration/test-partial-file-support b/test/integration/test-partial-file-support
index 98b2f242a..c07af7bd0 100755
--- a/test/integration/test-partial-file-support
+++ b/test/integration/test-partial-file-support
@@ -17,20 +17,32 @@ DOWNLOADLOG='rootdir/tmp/testdownloadfile.log'
testdownloadfile() {
rm -f "$DOWNLOADLOG"
- msgtest "Testing download of file $2 with" "$1"
- if ! downloadfile "$2" "$3" > "$DOWNLOADLOG"; then
+ msgtest "Testing download of file $2 with" "$1 $5"
+ if ! downloadfile "$2" "$3" "$5" > "$DOWNLOADLOG"; then
cat >&2 "$DOWNLOADLOG"
msgfail
else
msgpass
fi
- cat "$DOWNLOADLOG" | while read field hash; do
+ sed -e '/^ <- / s#%20# #g' -e '/^ <- / s#%0a#\n#g' "$DOWNLOADLOG" | grep '^.*-Hash: ' > receivedhashes.log
+ testsuccess test -s receivedhashes.log
+ local HASHES_OK=0
+ local HASHES_BAD=0
+ while read field hash; do
local EXPECTED
case "$field" in
'MD5Sum-Hash:') EXPECTED="$(md5sum "$TESTFILE" | cut -d' ' -f 1)";;
'SHA1-Hash:') EXPECTED="$(sha1sum "$TESTFILE" | cut -d' ' -f 1)";;
'SHA256-Hash:') EXPECTED="$(sha256sum "$TESTFILE" | cut -d' ' -f 1)";;
'SHA512-Hash:') EXPECTED="$(sha512sum "$TESTFILE" | cut -d' ' -f 1)";;
+ 'Checksum-FileSize-Hash:')
+ #filesize is too weak to check for !=
+ if [ "$4" = '=' ]; then
+ EXPECTED="$(stat -c '%s' "$TESTFILE")"
+ else
+ continue
+ fi
+ ;;
*) continue;;
esac
if [ "$4" = '=' ]; then
@@ -40,15 +52,47 @@ testdownloadfile() {
fi
if [ "$EXPECTED" "$4" "$hash" ]; then
msgpass
+ HASHES_OK=$((HASHES_OK+1));
else
- cat >&2 "$DOWNLOADLOG"
msgfail "expected: $EXPECTED ; got: $hash"
+ HASHES_BAD=$((HASHES_BAD+1));
fi
- done
+ done < receivedhashes.log
+ msgtest 'At least one good hash and no bad ones'
+ if [ $HASHES_OK -eq 0 ] || [ $HASHES_BAD -ne 0 ]; then
+ cat >&2 "$DOWNLOADLOG"
+ msgfail
+ else
+ msgpass
+ fi
}
TESTFILE='aptarchive/testfile'
cp -a ${TESTDIR}/framework $TESTFILE
+cp -a ${TESTDIR}/framework "${TESTFILE}2"
+
+followuprequest() {
+ local DOWN='./downloaded/testfile'
+
+ copysource $TESTFILE 1M $DOWN
+ testdownloadfile 'completely downloaded file' "${1}/testfile" "$DOWN" '='
+ testwebserverlaststatuscode '416' "$DOWNLOADLOG"
+
+ webserverconfig 'aptwebserver::support::content-range' 'false'
+ copysource $TESTFILE 1M $DOWN
+ testdownloadfile 'completely downloaded file' "${1}/testfile" "$DOWN" '=' "SHA1:$(sha1sum "$TESTFILE" | cut -d' ' -f 1)"
+ testwebserverlaststatuscode '416' "$DOWNLOADLOG"
+ webserverconfig 'aptwebserver::support::content-range' 'true'
+
+ copysource $TESTFILE 1M $DOWN
+ copysource "${TESTFILE}2" 20 "${DOWN}2"
+ msgtest 'Testing download of files with' 'completely downloaded file + partial file'
+ testsuccess --nomsg apthelper -o Debug::Acquire::${1%%:*}=1 -o Debug::pkgAcquire::Worker=1 \
+ download-file "$1/testfile" "$DOWN" '' "$1/testfile2" "${DOWN}2"
+ testwebserverlaststatuscode '206' 'rootdir/tmp/testsuccess.output'
+ testsuccess diff -u "$TESTFILE" "${DOWN}"
+ testsuccess diff -u "${DOWN}" "${DOWN}2"
+}
testrun() {
webserverconfig 'aptwebserver::support::range' 'true'
@@ -66,9 +110,11 @@ testrun() {
testdownloadfile 'invalid partial data' "${1}/testfile" "$DOWN" '!='
testwebserverlaststatuscode '206' "$DOWNLOADLOG"
- copysource $TESTFILE 1M $DOWN
- testdownloadfile 'completely downloaded file' "${1}/testfile" "$DOWN" '='
- testwebserverlaststatuscode '416' "$DOWNLOADLOG"
+ webserverconfig 'aptwebserver::closeOnError' 'false'
+ followuprequest "$1"
+ webserverconfig 'aptwebserver::closeOnError' 'true'
+ followuprequest "$1"
+ webserverconfig 'aptwebserver::closeOnError' 'false'
copysource /dev/zero 1M $DOWN
testdownloadfile 'too-big partial file' "${1}/testfile" "$DOWN" '='
@@ -86,8 +132,17 @@ testrun() {
testwebserverlaststatuscode '200' "$DOWNLOADLOG"
}
-testrun 'http://localhost:8080'
+serverconfigs() {
+ msgmsg "${1%%:*}: Test with Content-Length"
+ webserverconfig 'aptwebserver::chunked-transfer-encoding' 'false'
+ testrun "$1"
+ msgmsg "${1%%:*}: Test with Transfer-Encoding: chunked"
+ webserverconfig 'aptwebserver::chunked-transfer-encoding' 'true'
+ testrun "$1"
+}
+
+serverconfigs 'http://localhost:8080'
changetohttpswebserver
-testrun 'https://localhost:4433'
+serverconfigs 'https://localhost:4433'
diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage
index 5bad90214..e5fe21e0f 100755
--- a/test/integration/test-pdiff-usage
+++ b/test/integration/test-pdiff-usage
@@ -14,16 +14,7 @@ changetowebserver
PKGFILE="${TESTDIR}/$(echo "$(basename $0)" | sed 's#^test-#Packages-#')"
wasmergeused() {
- msgtest 'Test for successful execution of' "$*"
- local OUTPUT=$(mktemp)
- addtrap "rm $OUTPUT;"
- if aptget update "$@" >${OUTPUT} 2>&1; then
- msgpass
- else
- echo
- cat $OUTPUT
- msgfail
- fi
+ testsuccess aptget update "$@"
msgtest 'No intermediate patch files' 'still exist'
local EDS="$(find rootdir/var/lib/apt/lists -name '*.ed' -o -name '*.ed.*')"
@@ -36,7 +27,7 @@ wasmergeused() {
fi
msgtest 'Check if the right pdiff merger was used'
- if grep -q '^pkgAcqIndexMergeDiffs::Done(): rred' $OUTPUT; then
+ if grep -q '^pkgAcqIndexMergeDiffs::Done(): rred' rootdir/tmp/testsuccess.output; then
if echo "$*" | grep -q -- '-o Acquire::PDiffs::Merge=1'; then
msgpass
else
@@ -51,16 +42,18 @@ wasmergeused() {
testrun() {
msgmsg "Testcase: setup the base with: $*"
+ local DOWNLOADHASH=true
+ if [ "$1" = 'nohash' ]; then DOWNLOADHASH=false; shift; fi
find aptarchive -name 'Packages*' -type f -delete
cp ${PKGFILE} aptarchive/Packages
compressfile 'aptarchive/Packages'
generatereleasefiles
signreleasefiles
- rm -rf aptarchive/Packages.diff rootdir/var/lib/apt/lists
+ rm -rf aptarchive/Packages.diff rootdir/var/lib/apt/lists rootdir/var/lib/apt/lists-bak
testsuccess aptget update "$@"
cp -a rootdir/var/lib/apt/lists rootdir/var/lib/apt/lists-bak
testnopackage newstuff
- testequal "$(cat ${PKGFILE})
+ testsuccessequal "$(cat ${PKGFILE})
" aptcache show apt oldstuff
msgmsg "Testcase: apply with one patch: $*"
@@ -85,18 +78,29 @@ SHA256-History:
SHA256-Patches:
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 19722 2010-08-18-2013.28
$(sha256sum $PATCHFILE | cut -d' ' -f 1) $(stat -c%s $PATCHFILE) $(basename $PATCHFILE)" > $PATCHINDEX
+ if $DOWNLOADHASH; then
+ echo "SHA1-Download:
+ 2365ac0ac57cde3d43c63145e8251a3bd5410213 197 2010-08-18-2013.28.gz
+ $(sha1sum ${PATCHFILE}.gz | cut -d' ' -f 1) $(stat -c%s ${PATCHFILE}.gz) $(basename ${PATCHFILE}.gz)
+SHA256-Download:
+ d2a1b33187ed2d248eeae3b1223ea71791ea35f2138a713ed371332a6421f467 197 2010-08-18-2013.28.gz
+ $(sha256sum ${PATCHFILE}.gz | cut -d' ' -f 1) $(stat -c%s ${PATCHFILE}.gz) $(basename ${PATCHFILE}.gz)" >> $PATCHINDEX
+ fi
+
generatereleasefiles '+1hour'
signreleasefiles
find aptarchive -name 'Packages*' -type f -delete
wasmergeused "$@"
testnopackage oldstuff
- testequal "$(cat ${PKGFILE}-new)
+ testsuccessequal "$(cat ${PKGFILE}-new)
" aptcache show apt newstuff
msgmsg "Testcase: index is already up-to-date: $*"
find rootdir/var/lib/apt/lists -name '*diff_Index' -type f -delete
testsuccess aptget update "$@"
- testequal "$(cat ${PKGFILE}-new)
+ testequal 'Hit:1 http://localhost:8080 InRelease
+Reading package lists...' aptget update "$@" -o Debug::Acquire::Transaction=0 -o Debug::pkgAcquire::Diffs=0
+ testsuccessequal "$(cat ${PKGFILE}-new)
" aptcache show apt newstuff
msgmsg "Testcase: apply with two patches: $*"
@@ -138,6 +142,17 @@ SHA256-Patches:
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 19722 2010-08-18-2013.28
$(sha256sum $PATCHFILE | cut -d' ' -f 1) $(stat -c%s $PATCHFILE) $(basename $PATCHFILE)
$(sha256sum ${PATCHFILE2} | cut -d' ' -f 1) $(stat -c%s ${PATCHFILE2}) $(basename ${PATCHFILE2})" > $PATCHINDEX
+ if $DOWNLOADHASH; then
+ echo "SHA1-Download:
+ 2365ac0ac57cde3d43c63145e8251a3bd5410213 197 2010-08-18-2013.28.gz
+ $(sha1sum ${PATCHFILE}.gz | cut -d' ' -f 1) $(stat -c%s ${PATCHFILE}.gz) $(basename ${PATCHFILE}.gz)
+ $(sha1sum ${PATCHFILE2}.gz | cut -d' ' -f 1) $(stat -c%s ${PATCHFILE2}.gz) $(basename ${PATCHFILE2}.gz)
+SHA256-Download:
+ d2a1b33187ed2d248eeae3b1223ea71791ea35f2138a713ed371332a6421f467 197 2010-08-18-2013.28.gz
+ $(sha256sum ${PATCHFILE}.gz | cut -d' ' -f 1) $(stat -c%s ${PATCHFILE}.gz) $(basename ${PATCHFILE}.gz)
+ $(sha256sum ${PATCHFILE2}.gz | cut -d' ' -f 1) $(stat -c%s ${PATCHFILE2}.gz) $(basename ${PATCHFILE2}.gz)" >> $PATCHINDEX
+ fi
+
generatereleasefiles '+2hour'
signreleasefiles
cp -a aptarchive/Packages Packages-future
@@ -146,7 +161,7 @@ SHA256-Patches:
cp -a rootdir/var/lib/apt/lists-bak rootdir/var/lib/apt/lists
wasmergeused "$@"
testnopackage oldstuff
- testequal "$(cat Packages-future)
+ testsuccessequal "$(cat Packages-future)
" aptcache show apt newstuff futurestuff
msgmsg "Testcase: patch applying fails, but successful fallback: $*"
@@ -157,6 +172,7 @@ SHA256-Patches:
mkdir -p aptarchive/Packages.diff
PATCHFILE="aptarchive/Packages.diff/$(date +%Y-%m-%d-%H%M.%S)"
diff -e ${PKGFILE} ${PKGFILE}-new > ${PATCHFILE} || true
+ cat $PATCHFILE | gzip > ${PATCHFILE}.gz
PATCHINDEX='aptarchive/Packages.diff/Index'
echo "SHA1-Current: $(sha1sum ${PKGFILE}-new | cut -d' ' -f 1) $(stat -c%s ${PKGFILE}-new)
SHA1-History:
@@ -172,19 +188,75 @@ SHA256-History:
SHA256-Patches:
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 19722 2010-08-18-2013.28
$(sha256sum $PATCHFILE | cut -d' ' -f 1) $(stat -c%s $PATCHFILE) $(basename $PATCHFILE)" > $PATCHINDEX
- echo 'I am Mallory and I change files' >> $PATCHFILE
+ if $DOWNLOADHASH; then
+ echo "SHA1-Download:
+ 2365ac0ac57cde3d43c63145e8251a3bd5410213 197 2010-08-18-2013.28.gz
+ $(sha1sum ${PATCHFILE}.gz | cut -d' ' -f 1) $(stat -c%s ${PATCHFILE}.gz) $(basename ${PATCHFILE}.gz)
+SHA256-Download:
+ d2a1b33187ed2d248eeae3b1223ea71791ea35f2138a713ed371332a6421f467 197 2010-08-18-2013.28.gz
+ $(sha256sum ${PATCHFILE}.gz | cut -d' ' -f 1) $(stat -c%s ${PATCHFILE}.gz) $(basename ${PATCHFILE}.gz)" >> $PATCHINDEX
+ fi
+ # needs to look like a valid command, otherwise the parser will fail before hashes are checked
+ echo '1d' > $PATCHFILE
cat $PATCHFILE | gzip > ${PATCHFILE}.gz
generatereleasefiles '+1hour'
signreleasefiles
testsuccess aptget update "$@"
+ cp -f rootdir/tmp/testsuccess.output rootdir/tmp/aptgetupdate.output
+ testsuccess grep 'Hash Sum mismatch' rootdir/tmp/aptgetupdate.output
+ testnopackage oldstuff
+ testsuccessequal "$(cat ${PKGFILE}-new)
+" aptcache show apt newstuff
+
+ msgmsg "Testcase: pdiff patch bigger than index itself: $*"
+ rm -rf rootdir/var/lib/apt/lists
+ cp -a rootdir/var/lib/apt/lists-bak rootdir/var/lib/apt/lists
+ cp ${PKGFILE}-new aptarchive/Packages
+ compressfile 'aptarchive/Packages'
+ mkdir -p aptarchive/Packages.diff
+ PATCHFILE="aptarchive/Packages.diff/$(date +%Y-%m-%d-%H%M.%S)"
+ diff -e ${PKGFILE} ${PKGFILE}-new > ${PATCHFILE} || true
+ cat $PATCHFILE | gzip > ${PATCHFILE}.gz
+ PATCHINDEX='aptarchive/Packages.diff/Index'
+ echo "SHA1-Current: $(sha1sum ${PKGFILE}-new | cut -d' ' -f 1) $(stat -c%s ${PKGFILE}-new)
+SHA1-History:
+ 9f4148e06d7faa37062994ff10d0c842d7017513 33053002 2010-08-18-2013.28
+ $(sha1sum $PKGFILE | cut -d' ' -f 1) $(stat -c%s $PKGFILE) $(basename $PATCHFILE)
+SHA1-Patches:
+ 7651fc0ac57cd83d41c63195a9342e2db5650257 19722 2010-08-18-2013.28
+ $(sha1sum $PATCHFILE | cut -d' ' -f 1) $(stat -c%s $PATCHFILE)000 $(basename $PATCHFILE)
+SHA256-Current: $(sha256sum ${PKGFILE}-new | cut -d' ' -f 1) $(stat -c%s ${PKGFILE}-new)
+SHA256-History:
+ 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b 33053002 2010-08-18-2013.28
+ $(sha256sum $PKGFILE | cut -d' ' -f 1) $(stat -c%s $PKGFILE) $(basename $PATCHFILE)
+SHA256-Patches:
+ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 19722 2010-08-18-2013.28
+ $(sha256sum $PATCHFILE | cut -d' ' -f 1) $(stat -c%s $PATCHFILE)000 $(basename $PATCHFILE)" > $PATCHINDEX
+ if $DOWNLOADHASH; then
+ echo "SHA1-Download:
+ 2365ac0ac57cde3d43c63145e8251a3bd5410213 197 2010-08-18-2013.28.gz
+ $(sha1sum ${PATCHFILE}.gz | cut -d' ' -f 1) $(stat -c%s ${PATCHFILE}.gz)000 $(basename ${PATCHFILE}.gz)
+SHA256-Download:
+ d2a1b33187ed2d248eeae3b1223ea71791ea35f2138a713ed371332a6421f467 197 2010-08-18-2013.28.gz
+ $(sha256sum ${PATCHFILE}.gz | cut -d' ' -f 1) $(stat -c%s ${PATCHFILE}.gz)000 $(basename ${PATCHFILE}.gz)" >> $PATCHINDEX
+ fi
+ generatereleasefiles '+1hour'
+ signreleasefiles
+ #find aptarchive -name 'Packages*' -type f -delete
+ testsuccess aptget update -o Debug::pkgAcquire::Diffs=1 "$@"
+ cp -f rootdir/tmp/testsuccess.output rootdir/tmp/aptgetupdate.output
+ testsuccess grep 'bytes (Limit is' rootdir/tmp/aptgetupdate.output
testnopackage oldstuff
- testequal "$(cat ${PKGFILE}-new)
+ testsuccessequal "$(cat ${PKGFILE}-new)
" aptcache show apt newstuff
}
echo 'Debug::pkgAcquire::Diffs "true";
Debug::Acquire::Transaction "true";
Debug::pkgAcquire::rred "true";' > rootdir/etc/apt/apt.conf.d/rreddebug.conf
+testrun nohash -o Acquire::PDiffs::Merge=0 -o APT::Get::List-Cleanup=1
+testrun nohash -o Acquire::PDiffs::Merge=1 -o APT::Get::List-Cleanup=1
+
testrun -o Acquire::PDiffs::Merge=0 -o APT::Get::List-Cleanup=1
testrun -o Acquire::PDiffs::Merge=1 -o APT::Get::List-Cleanup=1
testrun -o Acquire::PDiffs::Merge=0 -o APT::Get::List-Cleanup=0
diff --git a/test/integration/test-pin-non-existent-package b/test/integration/test-pin-non-existent-package
index c567e5285..5c839283f 100755
--- a/test/integration/test-pin-non-existent-package
+++ b/test/integration/test-pin-non-existent-package
@@ -23,8 +23,8 @@ testcandidate() {
}
testcandidate rapt '0.8.15'
-testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
-testequal 'Reading package lists...
+testsuccessequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only
@@ -34,8 +34,8 @@ Pin: release a=unstable
Pin-Priority: -1' > rootdir/etc/apt/preferences
testcandidate rapt '(none)'
-testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
-testequal 'Reading package lists...
+testsuccessequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only
@@ -53,9 +53,9 @@ Pin: release a=unstable
Pin-Priority: 1000' >> rootdir/etc/apt/preferences
testcandidate rapt '(none)'
-testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
+testsuccessequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade --trivial-only
diff --git a/test/integration/test-policy-pinning b/test/integration/test-policy-pinning
index c08a2f103..9f7f457ae 100755
--- a/test/integration/test-policy-pinning
+++ b/test/integration/test-policy-pinning
@@ -17,78 +17,66 @@ testequalpolicy() {
local SP="$1"
local AP="$2"
shift 2
- testequal "Package files:
+ testsuccessequal "Package files:
$(echo "$SP" | awk '{ printf("%3s\n",$0) }') ${STATUS}
release a=now
- $(echo "$AP" | awk '{ printf("%3s\n",$0) }') file:${APTARCHIVE}/ Packages
+ $(echo "$AP" | awk '{ printf("%3s\n",$0) }') file:${APTARCHIVE} Packages
release c=
-Pinned packages:" aptcache policy $*
+Pinned packages:" aptcache policy "$@"
}
-aptgetupdate() {
- # just to be sure that no old files are used
- rm -rf rootdir/var/lib/apt
- if aptget update --allow-insecure-repositories -qq 2>&1 | grep '^E: '; then
- msgwarn 'apt-get update failed with an error'
- fi
-}
+testglobalpolicy() {
+ aptgetupdate
-### not signed archive
+ testequalpolicy 100 500
+ testequalpolicy 990 500 -t now
-aptgetupdate
+ sed -i aptarchive/Release -e 1i"NotAutomatic: yes"
+ aptgetupdate
-testequalpolicy 100 500
-testequalpolicy 990 500 -t now
+ testequalpolicy 100 1 -o Test=NotAutomatic
+ testequalpolicy 990 1 -o Test=NotAutomatic -t now
-sed -i aptarchive/Release -e 1i"NotAutomatic: yes"
-aptgetupdate
+ sed -i aptarchive/Release -e 1i"ButAutomaticUpgrades: yes"
+ aptgetupdate
-testequalpolicy 100 1 -o Test=NotAutomatic
-testequalpolicy 990 1 -o Test=NotAutomatic -t now
+ testequalpolicy 100 100 -o Test=ButAutomaticUpgrades
+ testequalpolicy 990 100 -o Test=ButAutomaticUpgrades -t now
-sed -i aptarchive/Release -e 1i"ButAutomaticUpgrades: yes"
-aptgetupdate
+ sed -i aptarchive/Release -e 's#NotAutomatic: yes#NotAutomatic: no#' -e '/ButAutomaticUpgrades: / d'
+ aptgetupdate
-testequalpolicy 100 100 -o Test=ButAutomaticUpgrades
-testequalpolicy 990 100 -o Test=ButAutomaticUpgrades -t now
+ testequalpolicy 100 500 -o Test=Automatic
+ testequalpolicy 990 500 -o Test=Automatic -t now
-sed -i aptarchive/Release -e 's#NotAutomatic: yes#NotAutomatic: no#' -e '/ButAutomaticUpgrades: / d'
-aptgetupdate
-
-testequalpolicy 100 500 -o Test=Automatic
-testequalpolicy 990 500 -o Test=Automatic -t now
-
-sed -i aptarchive/Release -e '/NotAutomatic: / d' -e '/ButAutomaticUpgrades: / d'
-
-### signed but no key in trusted
-
-signreleasefiles 'Marvin Paranoid'
-aptgetupdate
-testequalpolicy 100 500
-testequalpolicy 990 500 -t now
-
-sed -i aptarchive/Release -e 1i"NotAutomatic: yes"
-signreleasefiles 'Marvin Paranoid'
-aptgetupdate
-
-testequalpolicy 100 1 -o Test=NotAutomatic
-testequalpolicy 990 1 -o Test=NotAutomatic -t now
-
-sed -i aptarchive/Release -e 1i"ButAutomaticUpgrades: yes"
-signreleasefiles 'Marvin Paranoid'
-aptgetupdate
+ sed -i aptarchive/Release -e '/NotAutomatic: / d' -e '/ButAutomaticUpgrades: / d'
+}
-testequalpolicy 100 100 -o Test=ButAutomaticUpgrades
-testequalpolicy 990 100 -o Test=ButAutomaticUpgrades -t now
+msgmsg 'Test with not signed archive'
+aptgetupdate() {
+ rm -rf rootdir/var/lib/apt
+ testwarning aptget update --allow-insecure-repositories
+}
+testglobalpolicy
-sed -i aptarchive/Release -e 's#NotAutomatic: yes#NotAutomatic: no#' -e '/ButAutomaticUpgrades: / d'
-signreleasefiles 'Marvin Paranoid'
-aptgetupdate
+msgmsg 'Test with signed but no key in trusted'
+aptgetupdate() {
+ rm -rf rootdir/var/lib/apt
+ signreleasefiles 'Marvin Paranoid'
+ testwarning aptget update --allow-insecure-repositories
+}
+testglobalpolicy
-testequalpolicy 100 500 -o Test=Automatic
-testequalpolicy 990 500 -o Test=Automatic -t now
+# much the same tests will be executed below in more detail again for this one
+msgmsg 'Test with signed and valid key'
+aptgetupdate() {
+ rm -rf rootdir/var/lib/apt
+ signreleasefiles 'Joe Sixpack'
+ testsuccess aptget update
+}
+testglobalpolicy
-### signed and valid key
+msgmsg 'Test with specific packages'
buildsimplenativepackage "coolstuff" "all" "1.0" "stable"
buildsimplenativepackage "coolstuff" "all" "2.0~bpo1" "backports"
@@ -117,23 +105,23 @@ testequalpolicycoolstuff() {
local BPO1ARCHIVE=""
local BPO2ARCHIVE=""
if [ ! "$7" = "2.0~bpo2" ]; then
- BPO1ARCHIVE=" $(echo "$AB" | awk '{ printf("%3s\n",$0) }') file:${APTARCHIVE}/ backports/main i386 Packages"
+ BPO1ARCHIVE=" $(echo "$AB" | awk '{ printf("%3s\n",$0) }') file:${APTARCHIVE} backports/main i386 Packages"
else
BPO2ARCHIVE="
2.0~bpo2 $PB
- $(echo "$AB" | awk '{ printf("%3s\n",$0) }') file:${APTARCHIVE}/ backports/main i386 Packages"
+ $(echo "$AB" | awk '{ printf("%3s\n",$0) }') file:${APTARCHIVE} backports/main i386 Packages"
SB="$(echo "$SB" | tail -n 1)"
shift
fi
shift 6
- testequal "coolstuff:
+ testsuccessequal "coolstuff:
Installed: $INSTALLED
Candidate: $CANDIDATE
${PINVERSION}Version table:${BPO2ARCHIVE}
$IB 2.0~bpo1 $PB
${BPO1ARCHIVE}$SB
$IS 1.0 $PB
- $(echo "$AS" | awk '{ printf("%3s\n",$0) }') file:${APTARCHIVE}/ stable/main i386 Packages$SS" \
+ $(echo "$AS" | awk '{ printf("%3s\n",$0) }') file:${APTARCHIVE} stable/main i386 Packages$SS" \
aptcache policy coolstuff -o Policy=${INSTALLED}-${CANDIDATE}-${AB}-${AS}-${PB} $*
}
diff --git a/test/integration/test-prefer-higher-priority-providers b/test/integration/test-prefer-higher-priority-providers
index 64b901dd0..85a302fb1 100755
--- a/test/integration/test-prefer-higher-priority-providers
+++ b/test/integration/test-prefer-higher-priority-providers
@@ -13,7 +13,7 @@ insertpackage 'unstable' 'awesome' 'all' '1' 'Depends: stuff'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
foo
@@ -25,7 +25,7 @@ Inst awesome (1 unstable [all])
Conf foo (1 unstable [all])
Conf awesome (1 unstable [all])' aptget install awesome -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
awesome foo
@@ -35,7 +35,7 @@ Inst awesome (1 unstable [all])
Conf foo (1 unstable [all])
Conf awesome (1 unstable [all])' aptget install awesome foo -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Package 'bar' is not installed, so not removed
Package 'baz' is not installed, so not removed
@@ -49,7 +49,7 @@ Inst awesome (1 unstable [all])
Conf foo (1 unstable [all])
Conf awesome (1 unstable [all])" aptget install awesome bar- baz- -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Package 'foo' is not installed, so not removed
The following extra packages will be installed:
@@ -62,7 +62,7 @@ Inst awesome (1 unstable [all])
Conf bar (1 unstable [all])
Conf awesome (1 unstable [all])" aptget install awesome foo- -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Package 'foo' is not installed, so not removed
Package 'baz' is not installed, so not removed
@@ -76,7 +76,7 @@ Inst awesome (1 unstable [all])
Conf bar (1 unstable [all])
Conf awesome (1 unstable [all])" aptget install awesome foo- baz- -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Package 'foo' is not installed, so not removed
Package 'bar' is not installed, so not removed
@@ -90,7 +90,7 @@ Inst awesome (1 unstable [all])
Conf baz (1 unstable [all])
Conf awesome (1 unstable [all])" aptget install awesome foo- bar- -s
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Package 'foo' is not installed, so not removed
Package 'bar' is not installed, so not removed
diff --git a/test/integration/test-prefer-native-architecture-over-higher-priority b/test/integration/test-prefer-native-architecture-over-higher-priority
index 2e5696376..7e4f8f34b 100755
--- a/test/integration/test-prefer-native-architecture-over-higher-priority
+++ b/test/integration/test-prefer-native-architecture-over-higher-priority
@@ -12,7 +12,7 @@ insertpackage 'unstable' 'autoconf' 'all' '1' 'Depends: m4'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
m4
diff --git a/test/integration/test-prevent-markinstall-multiarch-same-versionscrew b/test/integration/test-prevent-markinstall-multiarch-same-versionscrew
index db97687ce..5f67c0191 100755
--- a/test/integration/test-prevent-markinstall-multiarch-same-versionscrew
+++ b/test/integration/test-prevent-markinstall-multiarch-same-versionscrew
@@ -38,7 +38,7 @@ insertpackage 'unstable' 'libsame3' 'i386,amd64' '3' 'Multi-Arch: same'
insertpackage 'unstable' 'depender3' 'all' '3' 'Depends: libsame3 (= 3)'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
@@ -69,7 +69,7 @@ insertinstalledpackage 'libsame2' 'i386' '1' 'Multi-Arch: same'
insertinstalledpackage 'libsame3' 'i386' '1' 'Multi-Arch: same'
# the error message isn't great, but better than nothing, right?
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
@@ -81,7 +81,7 @@ The following packages have unmet dependencies:
depender2 : Depends: libsame2 (= 2) but it is not going to be installed
E: Unable to correct problems, you have held broken packages.' aptget install depender2 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
libsame3:i386 libsame3
diff --git a/test/integration/test-provides-gone-with-upgrade b/test/integration/test-provides-gone-with-upgrade
index 3b4bc2d04..61d34fa57 100755
--- a/test/integration/test-provides-gone-with-upgrade
+++ b/test/integration/test-provides-gone-with-upgrade
@@ -13,7 +13,7 @@ Replaces: apt (<< 0.8.15)'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following NEW packages will be installed:
diff --git a/test/integration/test-release-candidate-switching b/test/integration/test-release-candidate-switching
index 0970cb935..a1a6a6142 100755
--- a/test/integration/test-release-candidate-switching
+++ b/test/integration/test-release-candidate-switching
@@ -54,7 +54,7 @@ insertpackage 'experimental' 'uninstallablepkg' 'all' '1.0' 'Depends: libmtp8 (>
setupaptarchive
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
The following extra packages will be installed:
amarok-common (2.3.1-1+sid)
@@ -73,7 +73,7 @@ The following NEW packages will be installed:
After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok --trivial-only -V -q=0
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
The following extra packages will be installed:
amarok-common (2.3.2-2+exp)
@@ -92,7 +92,7 @@ The following NEW packages will be installed:
After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok -t experimental --trivial-only -V -q=0
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok'
@@ -114,7 +114,7 @@ The following NEW packages will be installed:
After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok/experimental --trivial-only -V -q=0
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-null'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-null'
@@ -137,7 +137,7 @@ After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-null/experimental --trivial-only -V -q=0
# do not select the same version multiple times
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok'
@@ -165,7 +165,7 @@ E: Trivial Only specified but this is not a trivial operation." aptget install a
# in theory, the second line is wrong, but printing the right version is too much of a hassle
# (we have to check if later in the Changed list is another change and if so use this version
# instead of the current candidate) - and it wouldn't be (really) useful anyway…
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Selected version '2.3.2-2+exp' (experimental2 [i386]) for 'amarok-less'
Selected version '5:4.6.0+exp' (experimental [i386]) for 'phonon-backend-xine' because of 'amarok-less'
@@ -192,7 +192,7 @@ After this operation, 301 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-less/experimental2 amarok-higher/experimental --trivial-only -V -q=0
# phonon-backend-null can't be used directly, but as it provides it is still fine…
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-null2'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-null2'
@@ -215,7 +215,7 @@ After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-null2/experimental --trivial-only -V -q=0
# if an or-group satisfier is already found, do not set others
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-xine'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-xine'
@@ -239,7 +239,7 @@ After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-xine/experimental --trivial-only -V -q=0
# … but proceed testing if the first doesn't work out
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-xine2'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-xine2'
@@ -263,7 +263,7 @@ After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-xine2/experimental --trivial-only -V -q=0
# sometimes, the second level need to be corrected, too
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-xine3'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-xine3'
@@ -290,7 +290,7 @@ After this operation, 301 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-xine3/experimental --trivial-only -V -q=0
# … but proceed testing if the first doesn't work out even in second deep
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-xine4'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-xine4'
@@ -314,7 +314,7 @@ After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-xine4/experimental --trivial-only -V -q=0
# providers can be broken, too
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-broken'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-broken'
@@ -338,7 +338,7 @@ After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-broken/experimental --trivial-only -V -q=0
# switch the candidate for recommends too if they should be installed
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-recommends'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-recommends'
@@ -361,7 +361,7 @@ After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-recommends/experimental --trivial-only -V -q=0 -o APT::Install-Recommends=1
# … or not if not
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-recommends'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-recommends'
@@ -382,7 +382,7 @@ E: Trivial Only specified but this is not a trivial operation." aptget install a
# but broken recommends are not the end of the world
# FIXME: the version output for recommend packages is a bit strange… but what would be better?
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-recommends2'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-recommends2'
@@ -404,7 +404,7 @@ After this operation, 215 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-recommends2/experimental --trivial-only -V -q=0 -o APT::Install-Recommends=1
# if one depends doesn't work, we don't need to look deeper…
-testequal "Reading package lists...
+testfailureequal "Reading package lists...
Building dependency tree...
Selected version '1.0' (experimental [all]) for 'uninstallablepkg'
Some packages could not be installed. This may mean that you have
diff --git a/test/integration/test-releasefile-date-older b/test/integration/test-releasefile-date-older
new file mode 100755
index 000000000..5cdc34fac
--- /dev/null
+++ b/test/integration/test-releasefile-date-older
@@ -0,0 +1,62 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'i386'
+
+insertpackage 'wheezy' 'apt' 'all' '0.8.15'
+
+setupaptarchive --no-update
+
+# we don't complain as the server could have just sent a 'Hit' here and this
+# 'downgrade attack' is usually performed by out-of-sync mirrors. Valid-Until
+# catches the 'real' downgrade attacks (expect that it finds stale mirrors).
+# Scaring users with an error here serves hence no point.
+
+msgmsg 'InRelease file is silently rejected if' 'new Date is before old Date'
+rm -rf rootdir/var/lib/apt/lists
+generatereleasefiles 'now' 'now + 7 days'
+signreleasefiles
+testsuccess aptget update
+listcurrentlistsdirectory > listsdir.lst
+redatereleasefiles 'now - 2 days'
+testsuccess aptget update
+testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
+
+msgmsg 'Release.gpg file is silently rejected if' 'new Date is before old Date'
+rm -rf rootdir/var/lib/apt/lists
+generatereleasefiles 'now' 'now + 7 days'
+signreleasefiles
+find aptarchive -name 'InRelease' -delete
+testsuccess aptget update
+listcurrentlistsdirectory > listsdir.lst
+redatereleasefiles 'now - 2 days'
+find aptarchive -name 'InRelease' -delete
+testsuccess aptget update
+testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
+
+msgmsg 'Crisscross InRelease/Release.gpg file is silently rejected if' 'new Date is before old Date'
+rm -rf rootdir/var/lib/apt/lists
+generatereleasefiles 'now' 'now + 7 days'
+signreleasefiles
+find aptarchive -name 'Release.gpg' -delete
+testsuccess aptget update
+listcurrentlistsdirectory > listsdir.lst
+redatereleasefiles 'now - 2 days'
+find aptarchive -name 'InRelease' -delete
+testsuccess aptget update
+testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
+
+msgmsg 'Crisscross Release.gpg/InRelease file is silently rejected if' 'new Date is before old Date'
+rm -rf rootdir/var/lib/apt/lists
+generatereleasefiles 'now' 'now + 7 days'
+signreleasefiles
+find aptarchive -name 'InRelease' -delete
+testsuccess aptget update
+listcurrentlistsdirectory > listsdir.lst
+redatereleasefiles 'now - 2 days'
+find aptarchive -name 'Release.gpg' -delete
+testsuccess aptget update
+testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"
diff --git a/test/integration/test-releasefile-valid-until b/test/integration/test-releasefile-valid-until
index 0d9a91254..e000abf5d 100755
--- a/test/integration/test-releasefile-valid-until
+++ b/test/integration/test-releasefile-valid-until
@@ -16,13 +16,12 @@ setupaptarchive --no-update
runtest() {
local MSG="$1"
- msgtest "$1" "$2"
+ msgtest "Release file is $MSG as it has" "$2"
rm -rf rootdir/var/lib/apt/lists
- aptget clean
generatereleasefiles "$3" "$4"
signreleasefiles
shift 4
- if expr match "$MSG" '.*accepted.*' >/dev/null; then
+ if [ "$MSG" = 'accepted' ]; then
testsuccess --nomsg aptget update "$@"
testfailure grep -q 'is expired' rootdir/tmp/testsuccess.output
else
@@ -31,19 +30,19 @@ runtest() {
fi
}
-runtest 'Release file is accepted as it has' 'no Until' '' ''
-runtest 'Release file is accepted as it has' 'no Until and good Max-Valid' '' '' -o Acquire::Max-ValidTime=3600
-runtest 'Release file is rejected as it has' 'no Until, but bad Max-Valid' 'now - 2 days' '' -o Acquire::Max-ValidTime=3600
-runtest 'Release file is accepted as it has' 'good Until' 'now - 3 days' 'now + 1 day'
-runtest 'Release file is rejected as it has' 'bad Until' 'now - 7 days' 'now - 4 days'
-runtest 'Release file is rejected as it has' 'bad Until (ignore good Max-Valid)' 'now - 7 days' 'now - 4 days' -o Acquire::Max-ValidTime=1209600
-runtest 'Release file is rejected as it has' 'bad Max-Valid (bad Until)' 'now - 7 days' 'now - 4 days' -o Acquire::Max-ValidTime=86400
-runtest 'Release file is rejected as it has' 'bad Max-Valid (good Until)' 'now - 7 days' 'now + 4 days' -o Acquire::Max-ValidTime=86400
-runtest 'Release file is accepted as it has' 'good labeled Max-Valid' 'now - 7 days' 'now + 4 days' -o Acquire::Max-ValidTime=86400 -o Acquire::Max-ValidTime::Testcases=1209600
-runtest 'Release file is rejected as it has' 'bad labeled Max-Valid' 'now - 7 days' 'now + 4 days' -o Acquire::Max-ValidTime=1209600 -o Acquire::Max-ValidTime::Testcases=86400
-runtest 'Release file is accepted as it has' 'good Until (good Min-Valid, no Max-Valid)' 'now - 7 days' 'now + 1 days' -o Acquire::Min-ValidTime=1209600
-runtest 'Release file is accepted as it has' 'good Min-Valid (bad Until, no Max-Valid)' 'now - 7 days' 'now - 4 days' -o Acquire::Min-ValidTime=1209600
-runtest 'Release file is accepted as it has' 'good Min-Valid (bad Until, good Max-Valid) <' 'now - 7 days' 'now - 2 days' -o Acquire::Min-ValidTime=1209600 -o Acquire::Max-ValidTime=2419200
-runtest 'Release file is rejected as it has' 'bad Max-Valid (bad Until, good Min-Valid) >' 'now - 7 days' 'now - 2 days' -o Acquire::Max-ValidTime=12096 -o Acquire::Min-ValidTime=2419200
-runtest 'Release file is rejected as it has' 'bad Max-Valid (bad Until, bad Min-Valid) <' 'now - 7 days' 'now - 2 days' -o Acquire::Min-ValidTime=12096 -o Acquire::Max-ValidTime=241920
-runtest 'Release file is rejected as it has' 'bad Max-Valid (bad Until, bad Min-Valid) >' 'now - 7 days' 'now - 2 days' -o Acquire::Max-ValidTime=12096 -o Acquire::Min-ValidTime=241920
+runtest 'accepted' 'no Until' '' ''
+runtest 'accepted' 'no Until and good Max-Valid' '' '' -o Acquire::Max-ValidTime=3600
+runtest 'rejected' 'no Until, but bad Max-Valid' 'now - 2 days' '' -o Acquire::Max-ValidTime=3600
+runtest 'accepted' 'good Until' 'now - 3 days' 'now + 1 day'
+runtest 'rejected' 'bad Until' 'now - 7 days' 'now - 4 days'
+runtest 'rejected' 'bad Until (ignore good Max-Valid)' 'now - 7 days' 'now - 4 days' -o Acquire::Max-ValidTime=1209600
+runtest 'rejected' 'bad Max-Valid (bad Until)' 'now - 7 days' 'now - 4 days' -o Acquire::Max-ValidTime=86400
+runtest 'rejected' 'bad Max-Valid (good Until)' 'now - 7 days' 'now + 4 days' -o Acquire::Max-ValidTime=86400
+runtest 'accepted' 'good labeled Max-Valid' 'now - 7 days' 'now + 4 days' -o Acquire::Max-ValidTime=86400 -o Acquire::Max-ValidTime::Testcases=1209600
+runtest 'rejected' 'bad labeled Max-Valid' 'now - 7 days' 'now + 4 days' -o Acquire::Max-ValidTime=1209600 -o Acquire::Max-ValidTime::Testcases=86400
+runtest 'accepted' 'good Until (good Min-Valid, no Max-Valid)' 'now - 7 days' 'now + 1 days' -o Acquire::Min-ValidTime=1209600
+runtest 'accepted' 'good Min-Valid (bad Until, no Max-Valid)' 'now - 7 days' 'now - 4 days' -o Acquire::Min-ValidTime=1209600
+runtest 'accepted' 'good Min-Valid (bad Until, good Max-Valid) <' 'now - 7 days' 'now - 2 days' -o Acquire::Min-ValidTime=1209600 -o Acquire::Max-ValidTime=2419200
+runtest 'rejected' 'bad Max-Valid (bad Until, good Min-Valid) >' 'now - 7 days' 'now - 2 days' -o Acquire::Max-ValidTime=12096 -o Acquire::Min-ValidTime=2419200
+runtest 'rejected' 'bad Max-Valid (bad Until, bad Min-Valid) <' 'now - 7 days' 'now - 2 days' -o Acquire::Min-ValidTime=12096 -o Acquire::Max-ValidTime=241920
+runtest 'rejected' 'bad Max-Valid (bad Until, bad Min-Valid) >' 'now - 7 days' 'now - 2 days' -o Acquire::Max-ValidTime=12096 -o Acquire::Min-ValidTime=241920
diff --git a/test/integration/test-releasefile-verification b/test/integration/test-releasefile-verification
index 3765a4b1f..e8419524c 100755
--- a/test/integration/test-releasefile-verification
+++ b/test/integration/test-releasefile-verification
@@ -33,7 +33,7 @@ prepare() {
}
installaptold() {
- testequal 'Reading package lists...
+ testsuccessequal 'Reading package lists...
Building dependency tree...
Suggested packages:
aptitude synaptic wajig dpkg-dev apt-doc bzip2 lzma python-apt
@@ -41,12 +41,12 @@ The following NEW packages will be installed:
apt
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
After this operation, 5370 kB of additional disk space will be used.
-Get:1 http://localhost:8080/ apt 0.7.25.3
+Get:1 http://localhost:8080 apt 0.7.25.3
Download complete and in download only mode' aptget install apt -dy
}
installaptnew() {
- testequal 'Reading package lists...
+ testsuccessequal 'Reading package lists...
Building dependency tree...
Suggested packages:
aptitude synaptic wajig dpkg-dev apt-doc bzip2 lzma python-apt
@@ -54,12 +54,12 @@ The following NEW packages will be installed:
apt
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
After this operation, 5808 kB of additional disk space will be used.
-Get:1 http://localhost:8080/ apt 0.8.0~pre1
+Get:1 http://localhost:8080 apt 0.8.0~pre1
Download complete and in download only mode' aptget install apt -dy
}
failaptold() {
- testequal 'Reading package lists...
+ testfailureequal 'Reading package lists...
Building dependency tree...
Suggested packages:
aptitude synaptic wajig dpkg-dev apt-doc bzip2 lzma python-apt
@@ -73,7 +73,7 @@ E: There are problems and -y was used without --force-yes' aptget install apt -d
}
failaptnew() {
- testequal 'Reading package lists...
+ testfailureequal 'Reading package lists...
Building dependency tree...
Suggested packages:
aptitude synaptic wajig dpkg-dev apt-doc bzip2 lzma python-apt
@@ -91,25 +91,9 @@ touch aptarchive/apt.deb
PKGFILE="${TESTDIR}/$(echo "$(basename $0)" | sed 's#^test-#Packages-#')"
-updatesuccess() {
- local LOG='update.log'
- if aptget update >$LOG 2>&1 || grep -q -E '^(W|E): ' $LOG; then
- msgpass
- else
- cat $LOG
- msgfail
- fi
-}
-
-updatefailure() {
- local LOG='update.log'
- aptget update >$LOG 2>&1 || true
- if grep -q -E "$1" $LOG; then
- msgpass
- else
- cat $LOG
- msgfail
- fi
+updatewithwarnings() {
+ testwarning aptget update
+ testsuccess grep -E "$1" rootdir/tmp/testwarning.output
}
runtest() {
@@ -117,18 +101,18 @@ runtest() {
rm -rf rootdir/var/lib/apt/lists
signreleasefiles 'Joe Sixpack'
find aptarchive/ -name "$DELETEFILE" -delete
- msgtest 'Cold archive signed by' 'Joe Sixpack'
- updatesuccess
- testequal "$(cat ${PKGFILE})
+ msgmsg 'Cold archive signed by' 'Joe Sixpack'
+ testsuccess aptget update
+ testsuccessequal "$(cat ${PKGFILE})
" aptcache show apt
installaptold
prepare ${PKGFILE}-new
signreleasefiles 'Joe Sixpack'
find aptarchive/ -name "$DELETEFILE" -delete
- msgtest 'Good warm archive signed by' 'Joe Sixpack'
- updatesuccess
- testequal "$(cat ${PKGFILE}-new)
+ msgmsg 'Good warm archive signed by' 'Joe Sixpack'
+ testsuccess aptget update
+ testsuccessequal "$(cat ${PKGFILE}-new)
" aptcache show apt
installaptnew
@@ -137,9 +121,9 @@ runtest() {
cp keys/rexexpired.pub rootdir/etc/apt/trusted.gpg.d/rexexpired.gpg
signreleasefiles 'Rex Expired'
find aptarchive/ -name "$DELETEFILE" -delete
- msgtest 'Cold archive signed by' 'Rex Expired'
- updatefailure '^W: .* KEYEXPIRED'
- testequal "$(cat ${PKGFILE})
+ msgmsg 'Cold archive signed by' 'Rex Expired'
+ updatewithwarnings '^W: .* KEYEXPIRED'
+ testsuccessequal "$(cat ${PKGFILE})
" aptcache show apt
failaptold
rm rootdir/etc/apt/trusted.gpg.d/rexexpired.gpg
@@ -148,9 +132,9 @@ runtest() {
rm -rf rootdir/var/lib/apt/lists
signreleasefiles 'Marvin Paranoid'
find aptarchive/ -name "$DELETEFILE" -delete
- msgtest 'Cold archive signed by' 'Marvin Paranoid'
- updatefailure '^W: .* NO_PUBKEY'
- testequal "$(cat ${PKGFILE})
+ msgmsg 'Cold archive signed by' 'Marvin Paranoid'
+ updatewithwarnings '^W: .* NO_PUBKEY'
+ testsuccessequal "$(cat ${PKGFILE})
" aptcache show apt
failaptold
@@ -162,9 +146,9 @@ runtest() {
done
signreleasefiles 'Joe Sixpack'
find aptarchive/ -name "$DELETEFILE" -delete
- msgtest 'Bad warm archive signed by' 'Joe Sixpack'
- updatesuccess
- testequal "$(cat ${PKGFILE}-new)
+ msgmsg 'Bad warm archive signed by' 'Joe Sixpack'
+ testsuccess aptget update
+ testsuccessequal "$(cat ${PKGFILE}-new)
" aptcache show apt
installaptnew
@@ -173,18 +157,18 @@ runtest() {
rm -rf rootdir/var/lib/apt/lists
signreleasefiles 'Joe Sixpack'
find aptarchive/ -name "$DELETEFILE" -delete
- msgtest 'Cold archive signed by' 'Joe Sixpack'
- updatesuccess
- testequal "$(cat ${PKGFILE})
+ msgmsg 'Cold archive signed by' 'Joe Sixpack'
+ testsuccess aptget update
+ testsuccessequal "$(cat ${PKGFILE})
" aptcache show apt
installaptold
prepare ${PKGFILE}-new
signreleasefiles 'Marvin Paranoid'
find aptarchive/ -name "$DELETEFILE" -delete
- msgtest 'Good warm archive signed by' 'Marvin Paranoid'
- updatefailure '^W: .* NO_PUBKEY'
- testequal "$(cat ${PKGFILE})
+ msgmsg 'Good warm archive signed by' 'Marvin Paranoid'
+ updatewithwarnings '^W: .* NO_PUBKEY'
+ testsuccessequal "$(cat ${PKGFILE})
" aptcache show apt
installaptold
@@ -192,9 +176,9 @@ runtest() {
cp keys/rexexpired.pub rootdir/etc/apt/trusted.gpg.d/rexexpired.gpg
signreleasefiles 'Rex Expired'
find aptarchive/ -name "$DELETEFILE" -delete
- msgtest 'Good warm archive signed by' 'Rex Expired'
- updatefailure '^W: .* KEYEXPIRED'
- testequal "$(cat ${PKGFILE})
+ msgmsg 'Good warm archive signed by' 'Rex Expired'
+ updatewithwarnings '^W: .* KEYEXPIRED'
+ testsuccessequal "$(cat ${PKGFILE})
" aptcache show apt
installaptold
rm rootdir/etc/apt/trusted.gpg.d/rexexpired.gpg
@@ -202,9 +186,9 @@ runtest() {
prepare ${PKGFILE}-new
signreleasefiles
find aptarchive/ -name "$DELETEFILE" -delete
- msgtest 'Good warm archive signed by' 'Joe Sixpack'
- updatesuccess
- testequal "$(cat ${PKGFILE}-new)
+ msgmsg 'Good warm archive signed by' 'Joe Sixpack'
+ testsuccess aptget update
+ testsuccessequal "$(cat ${PKGFILE}-new)
" aptcache show apt
installaptnew
}
@@ -213,25 +197,25 @@ runtest2() {
prepare ${PKGFILE}
rm -rf rootdir/var/lib/apt/lists
signreleasefiles 'Joe Sixpack'
- msgtest 'Cold archive signed by' 'Joe Sixpack'
- updatesuccess
+ msgmsg 'Cold archive signed by' 'Joe Sixpack'
+ testsuccess aptget update
# New .deb but now an unsigned archive. For example MITM to circumvent
# package verification.
prepare ${PKGFILE}-new
find aptarchive/ -name InRelease -delete
find aptarchive/ -name Release.gpg -delete
- msgtest 'Warm archive signed by' 'nobody'
- updatesuccess
- testequal "$(cat ${PKGFILE}-new)
+ msgmsg 'Warm archive signed by' 'nobody'
+ updatewithwarnings 'W: .* no longer signed.'
+ testsuccessequal "$(cat ${PKGFILE}-new)
" aptcache show apt
failaptnew
# Unsigned archive from the beginning must also be detected.
rm -rf rootdir/var/lib/apt/lists
- msgtest 'Cold archive signed by' 'nobody'
- updatesuccess
- testequal "$(cat ${PKGFILE}-new)
+ msgmsg 'Cold archive signed by' 'nobody'
+ updatewithwarnings 'W: .* is not signed.'
+ testsuccessequal "$(cat ${PKGFILE}-new)
" aptcache show apt
failaptnew
}
diff --git a/test/integration/test-resolve-by-keep-new-recommends b/test/integration/test-resolve-by-keep-new-recommends
index 6b1772877..a8ab9057c 100755
--- a/test/integration/test-resolve-by-keep-new-recommends
+++ b/test/integration/test-resolve-by-keep-new-recommends
@@ -17,5 +17,5 @@ Calculating upgrade...
The following packages have been kept back:
foo
0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded."
-testequal "$UPGRADE_KEEP" aptget upgrade -s
+testsuccessequal "$UPGRADE_KEEP" aptget upgrade -s
diff --git a/test/integration/test-sourceslist-trusted-options b/test/integration/test-sourceslist-trusted-options
index 55d4e0233..5fe4933ce 100755
--- a/test/integration/test-sourceslist-trusted-options
+++ b/test/integration/test-sourceslist-trusted-options
@@ -15,7 +15,7 @@ setupaptarchive --no-update
APTARCHIVE=$(readlink -f ./aptarchive)
everythingsucceeds() {
- testequal 'Listing...
+ testsuccessequal 'Listing...
foo/testing 2 amd64
foo/stable 1 amd64
' apt list foo -a
@@ -32,7 +32,7 @@ foo/stable 1 amd64
}
everythingfails() {
- testequal 'Listing...
+ testsuccessequal 'Listing...
foo/testing 2 amd64
foo/stable 1 amd64
' apt list foo -a
diff --git a/test/integration/test-specific-architecture-dependencies b/test/integration/test-specific-architecture-dependencies
index 078a84654..1c72d7b22 100755
--- a/test/integration/test-specific-architecture-dependencies
+++ b/test/integration/test-specific-architecture-dependencies
@@ -12,16 +12,19 @@ insertinstalledpackage 'provider' 'amd64' '1' 'Provides: foo'
insertpackage 'unstable' 'pre-depender' 'all' '1' 'Pre-Depends: libc6:i386'
insertpackage 'unstable' 'depender' 'all' '1' 'Depends: libc6:i386'
+insertpackage 'unstable' 'depender-x32' 'i386,amd64' '1' 'Depends: libc6:i386'
+insertpackage 'unstable' 'depender-x64' 'i386,amd64' '1' 'Depends: libc6:amd64'
insertpackage 'unstable' 'breaker' 'all' '1' 'Breaks: libold (<< 2)'
-insertpackage 'unstable' 'breaker-x32' 'amd64' '1' 'Breaks: libold:i386 (<< 2)'
-insertpackage 'unstable' 'breaker-x64' 'i386' '1' 'Breaks: libold:amd64 (<< 2)'
+insertpackage 'unstable' 'breaker-x32' 'i386,amd64' '1' 'Breaks: libold:i386 (<< 2)'
+insertpackage 'unstable' 'breaker-x64' 'i386,amd64' '1' 'Breaks: libold:amd64 (<< 2)'
# conflicts with no effect
insertpackage 'unstable' 'oldconflictor' 'all' '1' 'Conflicts: libold (<< 0)'
insertpackage 'unstable' 'oldconflictor-x32' 'amd64' '1' 'Conflicts: libold:i386 (<< 0)'
insertpackage 'unstable' 'oldconflictor-x64' 'i386' '1' 'Conflicts: libold:amd64 (<< 0)'
insertpackage 'unstable' 'foo-depender' 'i386,amd64' '1' 'Depends: foo'
+insertpackage 'unstable' 'foo-native-depender' 'amd64' '1' 'Depends: foo:amd64'
insertpackage 'unstable' 'foo-foreign-depender' 'i386' '1' 'Depends: foo:amd64'
insertpackage 'unstable' 'foo-conflictor' 'i386,amd64' '1' 'Conflicts: foo'
@@ -30,7 +33,7 @@ insertpackage 'unstable' 'foo-no-conflictor' 'i386' '1' 'Conflicts: foo:i386'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
libc6:i386
@@ -42,7 +45,7 @@ Conf libc6:i386 (1 unstable [i386])
Inst pre-depender (1 unstable [all])
Conf pre-depender (1 unstable [all])' aptget install pre-depender -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
libc6:i386
@@ -54,6 +57,54 @@ Inst depender (1 unstable [all])
Conf libc6:i386 (1 unstable [i386])
Conf depender (1 unstable [all])' aptget install depender -s
+testsuccessequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+ libc6:i386
+The following NEW packages will be installed:
+ depender-x32:i386 libc6:i386
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst libc6:i386 (1 unstable [i386])
+Inst depender-x32:i386 (1 unstable [i386])
+Conf libc6:i386 (1 unstable [i386])
+Conf depender-x32:i386 (1 unstable [i386])' aptget install depender-x32:i386 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+ libc6:i386
+The following NEW packages will be installed:
+ depender-x32 libc6:i386
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst libc6:i386 (1 unstable [i386])
+Inst depender-x32 (1 unstable [amd64])
+Conf libc6:i386 (1 unstable [i386])
+Conf depender-x32 (1 unstable [amd64])' aptget install depender-x32:amd64 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+ libc6
+The following NEW packages will be installed:
+ depender-x64 libc6
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst libc6 (1 unstable [amd64])
+Inst depender-x64 (1 unstable [amd64])
+Conf libc6 (1 unstable [amd64])
+Conf depender-x64 (1 unstable [amd64])' aptget install depender-x64:amd64 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+ libc6
+The following NEW packages will be installed:
+ depender-x64:i386 libc6
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst libc6 (1 unstable [amd64])
+Inst depender-x64:i386 (1 unstable [i386])
+Conf libc6 (1 unstable [amd64])
+Conf depender-x64:i386 (1 unstable [i386])' aptget install depender-x64:i386 -s
+
testequal 'Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
@@ -66,7 +117,7 @@ Remv libold:i386 [1]
Inst breaker (1 unstable [all])
Conf breaker (1 unstable [all])' aptget install breaker -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
libold:i386
@@ -75,20 +126,42 @@ The following NEW packages will be installed:
0 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
Remv libold:i386 [1]
Inst breaker-x32 (1 unstable [amd64])
-Conf breaker-x32 (1 unstable [amd64])' aptget install breaker-x32 -s
+Conf breaker-x32 (1 unstable [amd64])' aptget install breaker-x32:amd64 -s
testequal 'Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
+ libold:i386
+The following NEW packages will be installed:
+ breaker-x32:i386
+0 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
+Remv libold:i386 [1]
+Inst breaker-x32:i386 (1 unstable [i386])
+Conf breaker-x32:i386 (1 unstable [i386])' aptget install breaker-x32:i386 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages will be REMOVED:
+ libold
+The following NEW packages will be installed:
+ breaker-x64
+0 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
+Remv libold [1]
+Inst breaker-x64 (1 unstable [amd64])
+Conf breaker-x64 (1 unstable [amd64])' aptget install breaker-x64:amd64 -s
+
+testsuccessequal 'Reading package lists...
+Building dependency tree...
+The following packages will be REMOVED:
libold
The following NEW packages will be installed:
breaker-x64:i386
0 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
Remv libold [1]
Inst breaker-x64:i386 (1 unstable [i386])
-Conf breaker-x64:i386 (1 unstable [i386])' aptget install breaker-x64 -s
+Conf breaker-x64:i386 (1 unstable [i386])' aptget install breaker-x64:i386 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
oldconflictor
@@ -96,7 +169,7 @@ The following NEW packages will be installed:
Inst oldconflictor (1 unstable [all])
Conf oldconflictor (1 unstable [all])' aptget install oldconflictor -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
oldconflictor-x32
@@ -104,7 +177,7 @@ The following NEW packages will be installed:
Inst oldconflictor-x32 (1 unstable [amd64])
Conf oldconflictor-x32 (1 unstable [amd64])' aptget install oldconflictor-x32 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
oldconflictor-x64:i386
@@ -112,7 +185,7 @@ The following NEW packages will be installed:
Inst oldconflictor-x64:i386 (1 unstable [i386])
Conf oldconflictor-x64:i386 (1 unstable [i386])' aptget install oldconflictor-x64 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo-depender
@@ -120,7 +193,7 @@ The following NEW packages will be installed:
Inst foo-depender (1 unstable [amd64])
Conf foo-depender (1 unstable [amd64])' aptget install foo-depender -s
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
@@ -132,6 +205,14 @@ The following packages have unmet dependencies:
foo-depender:i386 : Depends: foo:i386 but it is not installable
E: Unable to correct problems, you have held broken packages.' aptget install foo-depender:i386 -s
+testsuccessequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ foo-native-depender
+0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst foo-native-depender (1 unstable [amd64])
+Conf foo-native-depender (1 unstable [amd64])' aptget install foo-native-depender -s
+
testequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
@@ -140,7 +221,7 @@ The following NEW packages will be installed:
Inst foo-foreign-depender:i386 (1 unstable [i386])
Conf foo-foreign-depender:i386 (1 unstable [i386])' aptget install foo-foreign-depender:i386 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
provider
@@ -151,7 +232,7 @@ Remv provider [1]
Inst foo-conflictor (1 unstable [amd64])
Conf foo-conflictor (1 unstable [amd64])' aptget install foo-conflictor -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
provider
@@ -162,7 +243,7 @@ Remv provider [1]
Inst foo-conflictor:i386 (1 unstable [i386])
Conf foo-conflictor:i386 (1 unstable [i386])' aptget install foo-conflictor:i386 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
provider
@@ -173,10 +254,69 @@ Remv provider [1]
Inst foo-foreign-conflictor:i386 (1 unstable [i386])
Conf foo-foreign-conflictor:i386 (1 unstable [i386])' aptget install foo-foreign-conflictor:i386 -s
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
foo-no-conflictor:i386
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Inst foo-no-conflictor:i386 (1 unstable [i386])
Conf foo-no-conflictor:i386 (1 unstable [i386])' aptget install foo-no-conflictor:i386 -s
+
+msgmsg 'switch to single architecture'
+configarchitecture 'amd64'
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+ libc6
+The following NEW packages will be installed:
+ depender-x64 libc6
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst libc6 (1 unstable [amd64])
+Inst depender-x64 (1 unstable [amd64])
+Conf libc6 (1 unstable [amd64])
+Conf depender-x64 (1 unstable [amd64])' aptget install depender-x64 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+E: Unable to locate package depender-x64' aptget install depender-x64:i386 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ foo-native-depender
+0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst foo-native-depender (1 unstable [amd64])
+Conf foo-native-depender (1 unstable [amd64])' aptget install foo-native-depender -s
+
+# libold:i386 is installed, but we don't see it as i386 isn't configured
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+ breaker-x32
+0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
+Inst breaker-x32 (1 unstable [amd64])
+Conf breaker-x32 (1 unstable [amd64])' aptget install breaker-x32:amd64 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages will be REMOVED:
+ libold
+The following NEW packages will be installed:
+ breaker-x64
+0 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
+Remv libold [1]
+Inst breaker-x64 (1 unstable [amd64])
+Conf breaker-x64 (1 unstable [amd64])' aptget install breaker-x64:amd64 -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+Some packages could not be installed. This may mean that you have
+requested an impossible situation or if you are using the unstable
+distribution that some required packages have not yet been created
+or been moved out of Incoming.
+The following information may help to resolve the situation:
+
+The following packages have unmet dependencies:
+ depender-x32 : Depends: libc6:i386 but it is not installable
+E: Unable to correct problems, you have held broken packages.' aptget install depender-x32 -s
diff --git a/test/integration/test-suggest-installed-multiarch-silbing b/test/integration/test-suggest-installed-multiarch-silbing
index 89640a30c..f2b1db5eb 100755
--- a/test/integration/test-suggest-installed-multiarch-silbing
+++ b/test/integration/test-suggest-installed-multiarch-silbing
@@ -26,26 +26,26 @@ insertpackage 'unstable' 'mozplugger' 'i386,amd64' '1' 'Depends: iceweasel | fir
setupaptarchive
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Package 'foo' is not installed, so not removed. Did you mean 'foo:i386'?
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget remove foo -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
foo2:i386
0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded.
Remv foo2:i386 [1]" aptget remove foo2 -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
The following packages will be REMOVED:
foo3
0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded.
Remv foo3 [1]" aptget remove foo3 -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Package 'foo3:i386' is not installed, so not removed. Did you mean 'foo3'?
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget remove foo3:i386 -s
@@ -58,22 +58,22 @@ Building dependency tree...
Package 'samefoo:armel' is not installed, so not removed. Did you mean 'samefoo:i386'?
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget remove samefoo:armel -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Package 'samefoo2' is not installed, so not removed. Did you mean 'samefoo2:i386'?
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget remove samefoo2 -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Package 'samefoo2:armel' is not installed, so not removed. Did you mean 'samefoo2:i386'?
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget remove samefoo2:armel -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Package 'iceweasel' is not installed, so not removed
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget remove iceweasel -s
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Package 'fireweasel' is not installed, so not removed. Did you mean 'fireweasel:i386'?
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." aptget remove fireweasel:amd64 -s
diff --git a/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum b/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum
index 574183b0a..48a7f0562 100755
--- a/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum
+++ b/test/integration/test-ubuntu-bug-1098738-apt-get-source-md5sum
@@ -145,11 +145,11 @@ cd downloaded
testok() {
rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz
- testequal "Reading package lists...
+ testsuccessequal "Reading package lists...
Building dependency tree...
Need to get 6 B of source archives.
-Get:1 http://localhost:8080/ $1 1.0 (dsc) [3 B]
-Get:2 http://localhost:8080/ $1 1.0 (tar) [3 B]
+Get:1 http://localhost:8080 $1 1.0 (dsc) [3 B]
+Get:2 http://localhost:8080 $1 1.0 (tar) [3 B]
Download complete and in download only mode" aptget source -d "$@"
msgtest 'Files were successfully downloaded for' "$1"
testsuccess --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz
@@ -159,7 +159,7 @@ Download complete and in download only mode" aptget source -d "$@"
testkeep() {
echo -n 'dsc' > ${1}_1.0.dsc
echo -n 'tar' > ${1}_1.0.tar.gz
- testequal "Reading package lists...
+ testsuccessequal "Reading package lists...
Building dependency tree...
Skipping already downloaded file '${1}_1.0.dsc'
Skipping already downloaded file '${1}_1.0.tar.gz'
@@ -172,11 +172,15 @@ Download complete and in download only mode" aptget source -d "$@"
testmismatch() {
rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz
- testequal "Reading package lists...
+ testfailureequal "Reading package lists...
Building dependency tree...
Need to get 6 B of source archives.
-Get:1 http://localhost:8080/ $1 1.0 (dsc) [3 B]
-Get:2 http://localhost:8080/ $1 1.0 (tar) [3 B]
+Get:1 http://localhost:8080 $1 1.0 (dsc) [3 B]
+Err:1 http://localhost:8080 $1 1.0 (dsc)
+ Hash Sum mismatch
+Get:2 http://localhost:8080 $1 1.0 (tar) [3 B]
+Err:2 http://localhost:8080 $1 1.0 (tar)
+ Hash Sum mismatch
E: Failed to fetch http://localhost:8080/${1}_1.0.dsc Hash Sum mismatch
E: Failed to fetch http://localhost:8080/${1}_1.0.tar.gz Hash Sum mismatch
@@ -186,7 +190,7 @@ E: Failed to fetch some archives." aptget source -d "$@"
testfailure --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz
rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz
- testequal "Reading package lists...
+ testsuccessequal "Reading package lists...
Building dependency tree...
Skipping download of file 'pkg-sha256-bad_1.0.dsc' as requested hashsum is not available for authentication
Skipping download of file 'pkg-sha256-bad_1.0.tar.gz' as requested hashsum is not available for authentication
@@ -196,11 +200,11 @@ Download complete and in download only mode" aptget source -d "$@" -o Acquire::F
testfailure --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz
rm -f ${1}_1.0.dsc ${1}_1.0.tar.gz
- testequal "Reading package lists...
+ testsuccessequal "Reading package lists...
Building dependency tree...
Need to get 6 B of source archives.
-Get:1 http://localhost:8080/ $1 1.0 (dsc) [3 B]
-Get:2 http://localhost:8080/ $1 1.0 (tar) [3 B]
+Get:1 http://localhost:8080 $1 1.0 (dsc) [3 B]
+Get:2 http://localhost:8080 $1 1.0 (tar) [3 B]
Download complete and in download only mode" aptget source --allow-unauthenticated -d "$@" -o Acquire::ForceHash=ROT26
msgtest 'Files were downloaded unauthenticated as user allowed it' "$1"
testsuccess --nomsg test -e ${1}_1.0.dsc -a -e ${1}_1.0.tar.gz
@@ -221,7 +225,7 @@ testok pkg-sha256-bad -o Acquire::ForceHash=MD5Sum
# not having MD5 sum doesn't mean the file doesn't exist at all …
testok pkg-no-md5
testok pkg-no-md5 -o Acquire::ForceHash=SHA256
-testequal "Reading package lists...
+testsuccessequal "Reading package lists...
Building dependency tree...
Skipping download of file 'pkg-no-md5_1.0.dsc' as requested hashsum is not available for authentication
Skipping download of file 'pkg-no-md5_1.0.tar.gz' as requested hashsum is not available for authentication
@@ -233,21 +237,25 @@ testfailure --nomsg test -e pkg-no-md5_1.0.dsc -a -e pkg-no-md5_1.0.tar.gz
# deal with cases in which we haven't for all files the same checksum type
# mostly pathologic as this shouldn't happen, but just to be sure
testok pkg-mixed-ok
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Need to get 6 B of source archives.
-Get:1 http://localhost:8080/ pkg-mixed-sha1-bad 1.0 (tar) [3 B]
-Get:2 http://localhost:8080/ pkg-mixed-sha1-bad 1.0 (dsc) [3 B]
+Get:1 http://localhost:8080 pkg-mixed-sha1-bad 1.0 (tar) [3 B]
+Get:2 http://localhost:8080 pkg-mixed-sha1-bad 1.0 (dsc) [3 B]
+Err:2 http://localhost:8080 pkg-mixed-sha1-bad 1.0 (dsc)
+ Hash Sum mismatch
E: Failed to fetch http://localhost:8080/pkg-mixed-sha1-bad_1.0.dsc Hash Sum mismatch
E: Failed to fetch some archives.' aptget source -d pkg-mixed-sha1-bad
msgtest 'Only tar file is downloaded as the dsc has hashsum mismatch' 'pkg-mixed-sha1-bad'
testsuccess --nomsg test ! -e pkg-mixed-sha1-bad_1.0.dsc -a -e pkg-mixed-sha1-bad_1.0.tar.gz
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Need to get 6 B of source archives.
-Get:1 http://localhost:8080/ pkg-mixed-sha2-bad 1.0 (tar) [3 B]
-Get:2 http://localhost:8080/ pkg-mixed-sha2-bad 1.0 (dsc) [3 B]
+Get:1 http://localhost:8080 pkg-mixed-sha2-bad 1.0 (tar) [3 B]
+Err:1 http://localhost:8080 pkg-mixed-sha2-bad 1.0 (tar)
+ Hash Sum mismatch
+Get:2 http://localhost:8080 pkg-mixed-sha2-bad 1.0 (dsc) [3 B]
E: Failed to fetch http://localhost:8080/pkg-mixed-sha2-bad_1.0.tar.gz Hash Sum mismatch
E: Failed to fetch some archives.' aptget source -d pkg-mixed-sha2-bad
@@ -256,9 +264,9 @@ testsuccess --nomsg test -e pkg-mixed-sha2-bad_1.0.dsc -a ! -e pkg-mixed-sha2-ba
# it gets even more pathologic: multiple entries for one file, some even disagreeing!
testok pkg-md5-agree
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
E: Error parsing checksum in Files of source package pkg-md5-disagree' aptget source -d pkg-md5-disagree
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
E: Error parsing checksum in Checksums-SHA256 of source package pkg-sha256-disagree' aptget source -d pkg-sha256-disagree
diff --git a/test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings b/test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings
index af6b7b504..192ed5efc 100755
--- a/test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings
+++ b/test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings
@@ -20,7 +20,7 @@ insertpackage 'unstable' 'steam' 'i386' '2' 'Depends: libmesa'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
libmesa:i386
@@ -31,7 +31,7 @@ Inst libmesa:i386 (1 stable [i386])
Inst steam:i386 (1 stable [i386])
Conf libmesa:i386 (1 stable [i386])
Conf steam:i386 (1 stable [i386])' aptget install steam -st stable
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
libmesa:i386
@@ -45,7 +45,7 @@ Conf steam:i386 (2 unstable [i386])' aptget install steam -st unstable
cp rootdir/var/lib/dpkg/status default-status.dpkg
insertinstalledpackage 'libmesa' 'amd64' '1' 'Multi-Arch: same'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
libmesa:i386
@@ -56,7 +56,7 @@ Inst libmesa:i386 (1 stable [i386])
Inst steam:i386 (1 stable [i386])
Conf libmesa:i386 (1 stable [i386])
Conf steam:i386 (1 stable [i386])' aptget install steam -st stable
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
libmesa libmesa:i386
@@ -76,7 +76,7 @@ cp default-status.dpkg rootdir/var/lib/dpkg/status
insertinstalledpackage 'libmesa-lts' 'amd64' '1' 'Provides: libmesa
Conflicts: libmesa
Multi-Arch: same'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
libmesa-lts:i386
@@ -87,7 +87,7 @@ Inst libmesa-lts:i386 (1 stable [i386])
Inst steam:i386 (1 stable [i386])
Conf libmesa-lts:i386 (1 stable [i386])
Conf steam:i386 (1 stable [i386])' aptget install steam -st stable
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
libmesa-lts libmesa-lts:i386
diff --git a/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard b/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard
index 45f70a898..b4f705d8b 100755
--- a/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard
+++ b/test/integration/test-ubuntu-bug-1304403-obsolete-priority-standard
@@ -25,7 +25,7 @@ insertinstalledpackage 'not-downloadable' 'all' '1.0' '' 'standard'
setupaptarchive
# discourage keeping obsolete high-priority packages …
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be REMOVED:
@@ -42,7 +42,7 @@ for i in $(seq 1 10); do
insertinstalledpackage "depender$i" 'all' '1.0' 'Depends: not-downloadable'
done
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages have been kept back:
diff --git a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
index df2c69cf6..ea516fc12 100755
--- a/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
+++ b/test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
@@ -40,7 +40,8 @@ msgtest 'Got expected failure message' 'apt-get update'
aptget update -qq 2>&1 | grep -q 'W:.*Does not start with a cleartext signature' && msgpass || msgfail
ensure_n_canary_strings_in_dir $LISTS 'ni ni ni' 0
-testequal 'partial' ls $LISTS
+testequal 'lock
+partial' ls $LISTS
# and again with pre-existing files with "valid data" which should remain
for f in Release Release.gpg main_binary-amd64_Packages main_source_Sources; do
diff --git a/test/integration/test-ubuntu-bug-614993 b/test/integration/test-ubuntu-bug-614993
index 49955f231..7067713e8 100755
--- a/test/integration/test-ubuntu-bug-614993
+++ b/test/integration/test-ubuntu-bug-614993
@@ -55,5 +55,5 @@ The following packages will be upgraded:
Need to get 0 B/5505 kB of archives.
After this operation, 2294 kB disk space will be freed.
E: Trivial Only specified but this is not a trivial operation."
-testequal "$UPGRADE" aptget install xserver-xorg --trivial-only
+testfailureequal "$UPGRADE" aptget install xserver-xorg --trivial-only
diff --git a/test/integration/test-ubuntu-bug-761175-remove-purge b/test/integration/test-ubuntu-bug-761175-remove-purge
index 14648e9b8..d5dfa2acf 100755
--- a/test/integration/test-ubuntu-bug-761175-remove-purge
+++ b/test/integration/test-ubuntu-bug-761175-remove-purge
@@ -4,33 +4,54 @@ set -e
TESTDIR=$(readlink -f $(dirname $0))
. $TESTDIR/framework
setupenvironment
-configarchitecture 'native'
-
-setupsimplenativepackage 'compiz-core' 'native' '1.0' 'unstable'
-BUILDDIR='incoming/compiz-core-1.0'
-mkdir -p ${BUILDDIR}/debian/compiz-core/etc
-echo 'foo=bar;' > ${BUILDDIR}/compiz.conf
-echo 'compiz.conf /etc/compiz.conf' >> ${BUILDDIR}/debian/install
-buildpackage "$BUILDDIR" 'unstable' 'main' 'native'
-rm -rf "$BUILDDIR"
+configarchitecture 'amd64' 'i386'
+
+buildcompizpkg() {
+ setupsimplenativepackage "compiz-core-$1" "$2" "$3" "$4"
+ BUILDDIR="incoming/compiz-core-$1-$3"
+ mkdir -p ${BUILDDIR}/debian/compiz-core/etc
+ echo 'foo=bar;' > ${BUILDDIR}/compiz.conf
+ echo 'compiz.conf /etc/compiz.conf' >> ${BUILDDIR}/debian/install
+ buildpackage "$BUILDDIR" "$4" 'main' "$2"
+ rm -rf "$BUILDDIR"
+}
+buildcompizpkg 'native' 'all' '1.0' 'stable'
+buildcompizpkg 'all' 'native' '1.0' 'stable'
+buildcompizpkg 'native' 'native' '2.0' 'unstable'
+buildcompizpkg 'all' 'all' '2.0' 'unstable'
setupaptarchive
+runtests() {
+ testdpkgnotinstalled compiz-core-$1
+ testsuccess aptget install compiz-core-$1 -t "${2:-unstable}"
+ testdpkginstalled compiz-core-$1
-testdpkgnotinstalled compiz-core
-testsuccess aptget install compiz-core
-testdpkginstalled compiz-core
-
-testsuccess aptget remove compiz-core -y
-testdpkgnotinstalled compiz-core
-
-msgtest 'Check that conffiles are still around for' 'compiz-core'
-dpkg -l compiz-core | grep -q '^rc' && msgpass || msgfail
+ testsuccess aptget remove compiz-core-$1 -y
+ testdpkgnotinstalled compiz-core-$1
+ testdpkgstatus 'rc' '1' "compiz-core-$1"
-testequal 'Reading package lists...
+ testsuccessequal "Reading package lists...
Building dependency tree...
Reading state information...
The following packages will be REMOVED:
- compiz-core*
+ compiz-core-$1*
0 upgraded, 0 newly installed, 1 to remove and 0 not upgraded.
-Purg compiz-core' aptget purge compiz-core -s
+Purg compiz-core-$1" aptget purge compiz-core-$1 -s
+ testsuccess aptget purge compiz-core-$1 -y
+ echo -n '' > rootdir/var/lib/dpkg/available # dpkg -l < 1.16.2 reads the available file by default, where the package can be found
+ testequalor2 "dpkg-query: no packages found matching compiz-core-$1" "No packages found matching compiz-core-$1." dpkg -l compiz-core-$1
+}
+
+msgmsg 'Test in multi arch environment'
+runtests 'native'
+runtests 'all'
+runtests 'native' 'stable'
+runtests 'all' 'stable'
+
+msgmsg 'Test in single arch environment'
+configarchitecture 'amd64'
+runtests 'native'
+runtests 'all'
+runtests 'native' 'stable'
+runtests 'all' 'stable'
diff --git a/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only b/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only
index 09315868b..754487a90 100755
--- a/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only
+++ b/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only
@@ -31,7 +31,7 @@ msgtest 'The unsigned garbage before signed block is' 'ignored'
aptget update -qq 2>&1 | grep -q 'W:.*Does not start with a cleartext signature' && msgpass || msgfail
ROOTDIR="$(readlink -f .)"
-testequal "Package files:
+testsuccessequal "Package files:
100 ${ROOTDIR}/rootdir/var/lib/dpkg/status
release a=now
Pinned packages:" aptcache policy
diff --git a/test/integration/test-ubuntu-bug-802901-multiarch-early-remove b/test/integration/test-ubuntu-bug-802901-multiarch-early-remove
index bdb4e5e4f..f56ff020c 100755
--- a/test/integration/test-ubuntu-bug-802901-multiarch-early-remove
+++ b/test/integration/test-ubuntu-bug-802901-multiarch-early-remove
@@ -15,7 +15,7 @@ Conflicts: libgl1'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following NEW packages will be installed:
libgl1-mesa-glx:i386
diff --git a/test/integration/test-ubuntu-bug-806274-install-suggests b/test/integration/test-ubuntu-bug-806274-install-suggests
index fb72f0999..3f02316f4 100755
--- a/test/integration/test-ubuntu-bug-806274-install-suggests
+++ b/test/integration/test-ubuntu-bug-806274-install-suggests
@@ -15,7 +15,7 @@ insertpackage 'unstable' 'baz' 'i386' '1.0'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
bar foo
@@ -32,7 +32,7 @@ Inst bar (1.0 unstable [i386])
Conf bar (1.0 unstable [i386])' aptget install apt -s --install-recommends --no-install-suggests
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
bar baz foo
@@ -48,7 +48,7 @@ Inst baz (1.0 unstable [i386])
Conf bar (1.0 unstable [i386])
Conf baz (1.0 unstable [i386])' aptget install apt -s --install-recommends --install-suggests
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
foo
@@ -64,7 +64,7 @@ Conf foo (1.0 unstable [i386])
Inst apt (0.8.15 unstable [i386])
Conf apt (0.8.15 unstable [i386])' aptget install apt -s --no-install-recommends --no-install-suggests
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
baz foo
diff --git a/test/integration/test-ubuntu-bug-859188-multiarch-reinstall b/test/integration/test-ubuntu-bug-859188-multiarch-reinstall
index be86f2e91..9bb99305e 100755
--- a/test/integration/test-ubuntu-bug-859188-multiarch-reinstall
+++ b/test/integration/test-ubuntu-bug-859188-multiarch-reinstall
@@ -21,7 +21,7 @@ Inst libsame:i386 [1.0] (1.0 unstable [i386])
Conf libsame (1.0 unstable [amd64])
Conf libsame:i386 (1.0 unstable [i386])'
-testequal "$REINSTALL" aptget install --reinstall libsame -s
-testequal "$REINSTALL" aptget install --reinstall libsame:amd64 -s
-testequal "$REINSTALL" aptget install --reinstall libsame:i386 -s
-testequal "$REINSTALL" aptget install --reinstall libsame:amd64 libsame:i386 -s
+testsuccessequal "$REINSTALL" aptget install --reinstall libsame -s
+testsuccessequal "$REINSTALL" aptget install --reinstall libsame:amd64 -s
+testsuccessequal "$REINSTALL" aptget install --reinstall libsame:i386 -s
+testsuccessequal "$REINSTALL" aptget install --reinstall libsame:amd64 libsame:i386 -s
diff --git a/test/integration/test-ubuntu-bug-985852-pre-depends-or-group-ordering b/test/integration/test-ubuntu-bug-985852-pre-depends-or-group-ordering
index d2b6b9bad..e9cbf958e 100755
--- a/test/integration/test-ubuntu-bug-985852-pre-depends-or-group-ordering
+++ b/test/integration/test-ubuntu-bug-985852-pre-depends-or-group-ordering
@@ -12,7 +12,7 @@ insertpackage 'unstable' 'custom' 'amd64' '2.0' 'Pre-Depends: grub-pc | grub'
setupaptarchive
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
diff --git a/test/integration/test-unpack-different-version-unpacked b/test/integration/test-unpack-different-version-unpacked
index 952f6e6b2..ae121cf4e 100755
--- a/test/integration/test-unpack-different-version-unpacked
+++ b/test/integration/test-unpack-different-version-unpacked
@@ -19,7 +19,7 @@ cleanstatus() {
#FIXME: the reported version is wrong, it should be 1, not 2
insertinstalledpackage 'libqtcore4' 'i386,amd64' '1' 'Multi-Arch: same' '' 'install ok unpacked'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
0 upgraded, 0 newly installed, 0 to remove and 2 not upgraded.
2 not fully installed or removed.
@@ -29,7 +29,7 @@ Conf libqtcore4:i386 (2 unstable [i386])' aptget install -s -f
cleanstatus
insertinstalledpackage 'libqtcore4' 'amd64' '2' 'Multi-Arch: same' '' 'install ok unpacked'
insertinstalledpackage 'libqtcore4' 'i386' '1' 'Multi-Arch: same' '' 'install ok unpacked'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Correcting dependencies... Done
The following extra packages will be installed:
@@ -45,7 +45,7 @@ Conf libqtcore4 (2 unstable [amd64])' aptget install -s -f
cleanstatus
insertinstalledpackage 'libqtcore4' 'i386' '2' 'Multi-Arch: same' '' 'install ok unpacked'
insertinstalledpackage 'libqtcore4' 'amd64' '1' 'Multi-Arch: same' '' 'install ok unpacked'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Correcting dependencies... Done
The following extra packages will be installed:
@@ -61,7 +61,7 @@ Conf libqtcore4:i386 (2 unstable [i386])' aptget install -s -f
cleanstatus
insertinstalledpackage 'libqtcore4' 'amd64' '2' 'Multi-Arch: same' '' 'install ok unpacked'
insertinstalledpackage 'libqtcore4' 'i386' '1' 'Multi-Arch: same'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Correcting dependencies... Done
The following extra packages will be installed:
@@ -77,7 +77,7 @@ Conf libqtcore4 (2 unstable [amd64])' aptget install -s -f
cleanstatus
insertinstalledpackage 'libqtcore4' 'i386' '2' 'Multi-Arch: same' '' 'install ok unpacked'
insertinstalledpackage 'libqtcore4' 'amd64' '1' 'Multi-Arch: same'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Correcting dependencies... Done
The following extra packages will be installed:
@@ -93,7 +93,7 @@ Conf libqtcore4:i386 (2 unstable [i386])' aptget install -s -f
cleanstatus
insertinstalledpackage 'libqtcore4' 'amd64' '2' 'Multi-Arch: same'
insertinstalledpackage 'libqtcore4' 'i386' '1' 'Multi-Arch: same' '' 'install ok unpacked'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Correcting dependencies... Done
The following extra packages will be installed:
@@ -108,7 +108,7 @@ Conf libqtcore4:i386 (2 unstable [i386])' aptget install -s -f
cleanstatus
insertinstalledpackage 'libqtcore4' 'i386' '2' 'Multi-Arch: same'
insertinstalledpackage 'libqtcore4' 'amd64' '1' 'Multi-Arch: same' '' 'install ok unpacked'
-testequal 'Reading package lists...
+testsuccessequal 'Reading package lists...
Building dependency tree...
Correcting dependencies... Done
The following extra packages will be installed:
diff --git a/test/integration/test-xorg-break-providers b/test/integration/test-xorg-break-providers
index 0be57d979..ff1f3b077 100755
--- a/test/integration/test-xorg-break-providers
+++ b/test/integration/test-xorg-break-providers
@@ -13,7 +13,7 @@ setupaptarchive
# The test ensures that only -intel will be upgraded
# (together with -core of course) and -vesa not touched.
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
The following extra packages will be installed:
xserver-xorg-video-intel
@@ -24,7 +24,7 @@ Need to get 0 B/2992 kB of archives.
After this operation, 24.6 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation.' aptget install xserver-xorg-core --trivial-only
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
@@ -34,7 +34,7 @@ Need to get 0 B/2992 kB of archives.
After this operation, 24.6 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation.' aptget upgrade --trivial-only
-testequal 'Reading package lists...
+testfailureequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
The following packages will be upgraded:
diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index 00004a524..411da0e8f 100644
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -19,82 +19,99 @@
#include <sys/stat.h>
#include <time.h>
#include <unistd.h>
+
+#include <algorithm>
#include <iostream>
#include <sstream>
#include <list>
#include <string>
#include <vector>
-static char const * httpcodeToStr(int const httpcode) /*{{{*/
+static std::string httpcodeToStr(int const httpcode) /*{{{*/
{
switch (httpcode)
{
// Informational 1xx
- case 100: return "100 Continue";
- case 101: return "101 Switching Protocols";
+ case 100: return _config->Find("aptwebserver::httpcode::100", "100 Continue");
+ case 101: return _config->Find("aptwebserver::httpcode::101", "101 Switching Protocols");
// Successful 2xx
- case 200: return "200 OK";
- case 201: return "201 Created";
- case 202: return "202 Accepted";
- case 203: return "203 Non-Authoritative Information";
- case 204: return "204 No Content";
- case 205: return "205 Reset Content";
- case 206: return "206 Partial Content";
+ case 200: return _config->Find("aptwebserver::httpcode::200", "200 OK");
+ case 201: return _config->Find("aptwebserver::httpcode::201", "201 Created");
+ case 202: return _config->Find("aptwebserver::httpcode::202", "202 Accepted");
+ case 203: return _config->Find("aptwebserver::httpcode::203", "203 Non-Authoritative Information");
+ case 204: return _config->Find("aptwebserver::httpcode::204", "204 No Content");
+ case 205: return _config->Find("aptwebserver::httpcode::205", "205 Reset Content");
+ case 206: return _config->Find("aptwebserver::httpcode::206", "206 Partial Content");
// Redirections 3xx
- case 300: return "300 Multiple Choices";
- case 301: return "301 Moved Permanently";
- case 302: return "302 Found";
- case 303: return "303 See Other";
- case 304: return "304 Not Modified";
- case 305: return "304 Use Proxy";
- case 307: return "307 Temporary Redirect";
+ case 300: return _config->Find("aptwebserver::httpcode::300", "300 Multiple Choices");
+ case 301: return _config->Find("aptwebserver::httpcode::301", "301 Moved Permanently");
+ case 302: return _config->Find("aptwebserver::httpcode::302", "302 Found");
+ case 303: return _config->Find("aptwebserver::httpcode::303", "303 See Other");
+ case 304: return _config->Find("aptwebserver::httpcode::304", "304 Not Modified");
+ case 305: return _config->Find("aptwebserver::httpcode::305", "305 Use Proxy");
+ case 307: return _config->Find("aptwebserver::httpcode::307", "307 Temporary Redirect");
// Client errors 4xx
- case 400: return "400 Bad Request";
- case 401: return "401 Unauthorized";
- case 402: return "402 Payment Required";
- case 403: return "403 Forbidden";
- case 404: return "404 Not Found";
- case 405: return "405 Method Not Allowed";
- case 406: return "406 Not Acceptable";
- case 407: return "407 Proxy Authentication Required";
- case 408: return "408 Request Time-out";
- case 409: return "409 Conflict";
- case 410: return "410 Gone";
- case 411: return "411 Length Required";
- case 412: return "412 Precondition Failed";
- case 413: return "413 Request Entity Too Large";
- case 414: return "414 Request-URI Too Large";
- case 415: return "415 Unsupported Media Type";
- case 416: return "416 Requested range not satisfiable";
- case 417: return "417 Expectation Failed";
- case 418: return "418 I'm a teapot";
+ case 400: return _config->Find("aptwebserver::httpcode::400", "400 Bad Request");
+ case 401: return _config->Find("aptwebserver::httpcode::401", "401 Unauthorized");
+ case 402: return _config->Find("aptwebserver::httpcode::402", "402 Payment Required");
+ case 403: return _config->Find("aptwebserver::httpcode::403", "403 Forbidden");
+ case 404: return _config->Find("aptwebserver::httpcode::404", "404 Not Found");
+ case 405: return _config->Find("aptwebserver::httpcode::405", "405 Method Not Allowed");
+ case 406: return _config->Find("aptwebserver::httpcode::406", "406 Not Acceptable");
+ case 407: return _config->Find("aptwebserver::httpcode::407", "407 Proxy Authentication Required");
+ case 408: return _config->Find("aptwebserver::httpcode::408", "408 Request Time-out");
+ case 409: return _config->Find("aptwebserver::httpcode::409", "409 Conflict");
+ case 410: return _config->Find("aptwebserver::httpcode::410", "410 Gone");
+ case 411: return _config->Find("aptwebserver::httpcode::411", "411 Length Required");
+ case 412: return _config->Find("aptwebserver::httpcode::412", "412 Precondition Failed");
+ case 413: return _config->Find("aptwebserver::httpcode::413", "413 Request Entity Too Large");
+ case 414: return _config->Find("aptwebserver::httpcode::414", "414 Request-URI Too Large");
+ case 415: return _config->Find("aptwebserver::httpcode::415", "415 Unsupported Media Type");
+ case 416: return _config->Find("aptwebserver::httpcode::416", "416 Requested range not satisfiable");
+ case 417: return _config->Find("aptwebserver::httpcode::417", "417 Expectation Failed");
+ case 418: return _config->Find("aptwebserver::httpcode::418", "418 I'm a teapot");
// Server error 5xx
- case 500: return "500 Internal Server Error";
- case 501: return "501 Not Implemented";
- case 502: return "502 Bad Gateway";
- case 503: return "503 Service Unavailable";
- case 504: return "504 Gateway Time-out";
- case 505: return "505 HTTP Version not supported";
- }
- return NULL;
+ case 500: return _config->Find("aptwebserver::httpcode::500", "500 Internal Server Error");
+ case 501: return _config->Find("aptwebserver::httpcode::501", "501 Not Implemented");
+ case 502: return _config->Find("aptwebserver::httpcode::502", "502 Bad Gateway");
+ case 503: return _config->Find("aptwebserver::httpcode::503", "503 Service Unavailable");
+ case 504: return _config->Find("aptwebserver::httpcode::504", "504 Gateway Time-out");
+ case 505: return _config->Find("aptwebserver::httpcode::505", "505 HTTP Version not supported");
+ }
+ return "";
}
/*}}}*/
+static bool chunkedTransferEncoding(std::list<std::string> const &headers) {
+ if (std::find(headers.begin(), headers.end(), "Transfer-Encoding: chunked") != headers.end())
+ return true;
+ if (_config->FindB("aptwebserver::chunked-transfer-encoding", false) == true)
+ return true;
+ return false;
+}
static void addFileHeaders(std::list<std::string> &headers, FileFd &data)/*{{{*/
{
- std::ostringstream contentlength;
- contentlength << "Content-Length: " << data.FileSize();
- headers.push_back(contentlength.str());
-
- std::string lastmodified("Last-Modified: ");
- lastmodified.append(TimeRFC1123(data.ModificationTime()));
- headers.push_back(lastmodified);
+ if (chunkedTransferEncoding(headers) == false)
+ {
+ std::ostringstream contentlength;
+ contentlength << "Content-Length: " << data.FileSize();
+ headers.push_back(contentlength.str());
+ }
+ if (_config->FindB("aptwebserver::support::last-modified", true) == true)
+ {
+ std::string lastmodified("Last-Modified: ");
+ lastmodified.append(TimeRFC1123(data.ModificationTime()));
+ headers.push_back(lastmodified);
+ }
}
/*}}}*/
static void addDataHeaders(std::list<std::string> &headers, std::string &data)/*{{{*/
{
- std::ostringstream contentlength;
- contentlength << "Content-Length: " << data.size();
- headers.push_back(contentlength.str());
+ if (chunkedTransferEncoding(headers) == false)
+ {
+ std::ostringstream contentlength;
+ contentlength << "Content-Length: " << data.size();
+ headers.push_back(contentlength.str());
+ }
}
/*}}}*/
static bool sendHead(int const client, int const httpcode, std::list<std::string> &headers)/*{{{*/
@@ -114,6 +131,9 @@ static bool sendHead(int const client, int const httpcode, std::list<std::string
date.append(TimeRFC1123(time(NULL)));
headers.push_back(date);
+ if (chunkedTransferEncoding(headers) == true)
+ headers.push_back("Transfer-Encoding: chunked");
+
std::clog << ">>> RESPONSE to " << client << " >>>" << std::endl;
bool Success = true;
for (std::list<std::string>::const_iterator h = headers.begin();
@@ -130,25 +150,55 @@ static bool sendHead(int const client, int const httpcode, std::list<std::string
return Success;
}
/*}}}*/
-static bool sendFile(int const client, FileFd &data) /*{{{*/
+static bool sendFile(int const client, std::list<std::string> const &headers, FileFd &data)/*{{{*/
{
bool Success = true;
+ bool const chunked = chunkedTransferEncoding(headers);
char buffer[500];
unsigned long long actual = 0;
while ((Success &= data.Read(buffer, sizeof(buffer), &actual)) == true)
{
if (actual == 0)
break;
- Success &= FileFd::Write(client, buffer, actual);
+
+ if (chunked == true)
+ {
+ std::string size;
+ strprintf(size, "%llX\r\n", actual);
+ Success &= FileFd::Write(client, size.c_str(), size.size());
+ Success &= FileFd::Write(client, buffer, actual);
+ Success &= FileFd::Write(client, "\r\n", strlen("\r\n"));
+ }
+ else
+ Success &= FileFd::Write(client, buffer, actual);
+ }
+ if (chunked == true)
+ {
+ char const * const finish = "0\r\n\r\n";
+ Success &= FileFd::Write(client, finish, strlen(finish));
}
if (Success == false)
- std::cerr << "SENDFILE: READ/WRITE ERROR to " << client << std::endl;
+ std::cerr << "SENDFILE:" << (chunked ? " CHUNKED" : "") << " READ/WRITE ERROR to " << client << std::endl;
return Success;
}
/*}}}*/
-static bool sendData(int const client, std::string const &data) /*{{{*/
+static bool sendData(int const client, std::list<std::string> const &headers, std::string const &data)/*{{{*/
{
- if (FileFd::Write(client, data.c_str(), data.size()) == false)
+ if (chunkedTransferEncoding(headers) == true)
+ {
+ unsigned long long const ullsize = data.length();
+ std::string size;
+ strprintf(size, "%llX\r\n", ullsize);
+ char const * const finish = "\r\n0\r\n\r\n";
+ if (FileFd::Write(client, size.c_str(), size.length()) == false ||
+ FileFd::Write(client, data.c_str(), ullsize) == false ||
+ FileFd::Write(client, finish, strlen(finish)) == false)
+ {
+ std::cerr << "SENDDATA: CHUNK WRITE ERROR to " << client << std::endl;
+ return false;
+ }
+ }
+ else if (FileFd::Write(client, data.c_str(), data.size()) == false)
{
std::cerr << "SENDDATA: WRITE ERROR to " << client << std::endl;
return false;
@@ -157,33 +207,38 @@ static bool sendData(int const client, std::string const &data) /*{{{*/
}
/*}}}*/
static void sendError(int const client, int const httpcode, std::string const &request,/*{{{*/
- bool content, std::string const &error = "", std::list<std::string> headers = std::list<std::string>())
+ bool const content, std::string const &error, std::list<std::string> &headers)
{
std::string response("<html><head><title>");
response.append(httpcodeToStr(httpcode)).append("</title></head>");
response.append("<body><h1>").append(httpcodeToStr(httpcode)).append("</h1>");
if (httpcode != 200)
- {
- if (error.empty() == false)
- response.append("<p><em>Error</em>: ").append(error).append("</p>");
- response.append("This error is a result of the request: <pre>");
- }
+ response.append("<p><em>Error</em>: ");
+ else
+ response.append("<p><em>Success</em>: ");
+ if (error.empty() == false)
+ response.append(error);
+ else
+ response.append(httpcodeToStr(httpcode));
+ if (httpcode != 200)
+ response.append("</p>This error is a result of the request: <pre>");
else
- {
- if (error.empty() == false)
- response.append("<p><em>Success</em>: ").append(error).append("</p>");
response.append("The successfully executed operation was requested by: <pre>");
- }
response.append(request).append("</pre></body></html>");
+ if (httpcode != 200)
+ {
+ if (_config->FindB("aptwebserver::closeOnError", false) == true)
+ headers.push_back("Connection: close");
+ }
addDataHeaders(headers, response);
sendHead(client, httpcode, headers);
if (content == true)
- sendData(client, response);
+ sendData(client, headers, response);
}
static void sendSuccess(int const client, std::string const &request,
- bool content, std::string const &error = "")
+ bool const content, std::string const &error, std::list<std::string> &headers)
{
- sendError(client, 200, request, content, error);
+ sendError(client, 200, request, content, error, headers);
}
/*}}}*/
static void sendRedirect(int const client, int const httpcode, std::string const &uri,/*{{{*/
@@ -220,7 +275,7 @@ static void sendRedirect(int const client, int const httpcode, std::string const
headers.push_back(location);
sendHead(client, httpcode, headers);
if (content == true)
- sendData(client, response);
+ sendData(client, headers, response);
}
/*}}}*/
static int filter_hidden_files(const struct dirent *a) /*{{{*/
@@ -262,16 +317,15 @@ static int grouped_alpha_case_sort(const struct dirent **a, const struct dirent
}
/*}}}*/
static void sendDirectoryListing(int const client, std::string const &dir,/*{{{*/
- std::string const &request, bool content)
+ std::string const &request, bool content, std::list<std::string> &headers)
{
- std::list<std::string> headers;
std::ostringstream listing;
struct dirent **namelist;
int const counter = scandir(dir.c_str(), &namelist, filter_hidden_files, grouped_alpha_case_sort);
if (counter == -1)
{
- sendError(client, 500, request, content);
+ sendError(client, 500, request, content, "scandir failed", headers);
return;
}
@@ -310,18 +364,18 @@ static void sendDirectoryListing(int const client, std::string const &dir,/*{{{*
addDataHeaders(headers, response);
sendHead(client, 200, headers);
if (content == true)
- sendData(client, response);
+ sendData(client, headers, response);
}
/*}}}*/
static bool parseFirstLine(int const client, std::string const &request,/*{{{*/
std::string &filename, std::string &params, bool &sendContent,
- bool &closeConnection)
+ bool &closeConnection, std::list<std::string> &headers)
{
if (strncmp(request.c_str(), "HEAD ", 5) == 0)
sendContent = false;
if (strncmp(request.c_str(), "GET ", 4) != 0)
{
- sendError(client, 501, request, true);
+ sendError(client, 501, request, true, "", headers);
return false;
}
@@ -332,7 +386,7 @@ static bool parseFirstLine(int const client, std::string const &request,/*{{{*/
if (lineend == std::string::npos || filestart == std::string::npos ||
fileend == std::string::npos || filestart == fileend)
{
- sendError(client, 500, request, sendContent, "Filename can't be extracted");
+ sendError(client, 500, request, sendContent, "Filename can't be extracted", headers);
return false;
}
@@ -344,14 +398,14 @@ static bool parseFirstLine(int const client, std::string const &request,/*{{{*/
closeConnection = strcasecmp(LookupTag(request, "Connection", "Keep-Alive").c_str(), "close") == 0;
else
{
- sendError(client, 500, request, sendContent, "Not a HTTP/1.{0,1} request");
+ sendError(client, 500, request, sendContent, "Not a HTTP/1.{0,1} request", headers);
return false;
}
filename = request.substr(filestart, fileend - filestart);
if (filename.find(' ') != std::string::npos)
{
- sendError(client, 500, request, sendContent, "Filename contains an unencoded space");
+ sendError(client, 500, request, sendContent, "Filename contains an unencoded space", headers);
return false;
}
@@ -359,7 +413,7 @@ static bool parseFirstLine(int const client, std::string const &request,/*{{{*/
if (host.empty() == true)
{
// RFC 2616 §14.23 requires Host
- sendError(client, 400, request, sendContent, "Host header is required");
+ sendError(client, 400, request, sendContent, "Host header is required", headers);
return false;
}
host = "http://" + host;
@@ -370,7 +424,7 @@ static bool parseFirstLine(int const client, std::string const &request,/*{{{*/
{
if (absolute.find("uri") == std::string::npos)
{
- sendError(client, 400, request, sendContent, "Request is absoluteURI, but configured to not accept that");
+ sendError(client, 400, request, sendContent, "Request is absoluteURI, but configured to not accept that", headers);
return false;
}
@@ -382,9 +436,9 @@ static bool parseFirstLine(int const client, std::string const &request,/*{{{*/
if (authConf.empty() != auth.empty())
{
if (auth.empty())
- sendError(client, 407, request, sendContent, "Proxy requires authentication");
+ sendError(client, 407, request, sendContent, "Proxy requires authentication", headers);
else
- sendError(client, 407, request, sendContent, "Client wants to authenticate to proxy, but proxy doesn't need it");
+ sendError(client, 407, request, sendContent, "Client wants to authenticate to proxy, but proxy doesn't need it", headers);
return false;
}
if (authConf.empty() == false)
@@ -395,7 +449,7 @@ static bool parseFirstLine(int const client, std::string const &request,/*{{{*/
auth.erase(0, strlen(basic));
if (auth != authConf)
{
- sendError(client, 407, request, sendContent, "Proxy-Authentication doesn't match");
+ sendError(client, 407, request, sendContent, "Proxy-Authentication doesn't match", headers);
return false;
}
}
@@ -410,7 +464,7 @@ static bool parseFirstLine(int const client, std::string const &request,/*{{{*/
}
else if (absolute.find("path") == std::string::npos && APT::String::Startswith(filename, "/_config/") == false)
{
- sendError(client, 400, request, sendContent, "Request is absolutePath, but configured to not accept that");
+ sendError(client, 400, request, sendContent, "Request is absolutePath, but configured to not accept that", headers);
return false;
}
@@ -421,9 +475,9 @@ static bool parseFirstLine(int const client, std::string const &request,/*{{{*/
if (authConf.empty() != auth.empty())
{
if (auth.empty())
- sendError(client, 401, request, sendContent, "Server requires authentication");
+ sendError(client, 401, request, sendContent, "Server requires authentication", headers);
else
- sendError(client, 401, request, sendContent, "Client wants to authenticate to server, but server doesn't need it");
+ sendError(client, 401, request, sendContent, "Client wants to authenticate to server, but server doesn't need it", headers);
return false;
}
if (authConf.empty() == false)
@@ -434,13 +488,12 @@ static bool parseFirstLine(int const client, std::string const &request,/*{{{*/
auth.erase(0, strlen(basic));
if (auth != authConf)
{
- sendError(client, 401, request, sendContent, "Authentication doesn't match");
+ sendError(client, 401, request, sendContent, "Authentication doesn't match", headers);
return false;
}
}
else
{
- std::list<std::string> headers;
headers.push_back("WWW-Authenticate: Basic");
sendError(client, 401, request, sendContent, "Unsupported Authentication Scheme", headers);
return false;
@@ -463,7 +516,8 @@ static bool parseFirstLine(int const client, std::string const &request,/*{{{*/
filename.find_first_of("\r\n\t\f\v") != std::string::npos ||
filename.find("/../") != std::string::npos)
{
- sendError(client, 400, request, sendContent, "Filename contains illegal character (sequence)");
+ std::list<std::string> headers;
+ sendError(client, 400, request, sendContent, "Filename contains illegal character (sequence)", headers);
return false;
}
@@ -499,7 +553,8 @@ static bool parseFirstLine(int const client, std::string const &request,/*{{{*/
return true;
}
/*}}}*/
-static bool handleOnTheFlyReconfiguration(int const client, std::string const &request, std::vector<std::string> parts)/*{{{*/
+static bool handleOnTheFlyReconfiguration(int const client, std::string const &request,/*{{{*/
+ std::vector<std::string> parts, std::list<std::string> &headers)
{
size_t const pcount = parts.size();
for (size_t i = 0; i < pcount; ++i)
@@ -507,40 +562,38 @@ static bool handleOnTheFlyReconfiguration(int const client, std::string const &r
if (pcount == 4 && parts[1] == "set")
{
_config->Set(parts[2], parts[3]);
- sendSuccess(client, request, true, "Option '" + parts[2] + "' was set to '" + parts[3] + "'!");
+ sendSuccess(client, request, true, "Option '" + parts[2] + "' was set to '" + parts[3] + "'!", headers);
return true;
}
else if (pcount == 4 && parts[1] == "find")
{
- std::list<std::string> headers;
std::string response = _config->Find(parts[2], parts[3]);
addDataHeaders(headers, response);
sendHead(client, 200, headers);
- sendData(client, response);
+ sendData(client, headers, response);
return true;
}
else if (pcount == 3 && parts[1] == "find")
{
- std::list<std::string> headers;
if (_config->Exists(parts[2]) == true)
{
std::string response = _config->Find(parts[2]);
addDataHeaders(headers, response);
sendHead(client, 200, headers);
- sendData(client, response);
+ sendData(client, headers, response);
return true;
}
- sendError(client, 404, request, "Requested Configuration option doesn't exist.");
+ sendError(client, 404, request, true, "Requested Configuration option doesn't exist", headers);
return false;
}
else if (pcount == 3 && parts[1] == "clear")
{
_config->Clear(parts[2]);
- sendSuccess(client, request, true, "Option '" + parts[2] + "' was cleared.");
+ sendSuccess(client, request, true, "Option '" + parts[2] + "' was cleared.", headers);
return true;
}
- sendError(client, 400, request, true, "Unknown on-the-fly configuration request");
+ sendError(client, 400, request, true, "Unknown on-the-fly configuration request", headers);
return false;
}
/*}}}*/
@@ -548,19 +601,30 @@ static void * handleClient(void * voidclient) /*{{{*/
{
int client = *((int*)(voidclient));
std::clog << "ACCEPT client " << client << std::endl;
- std::vector<std::string> messages;
- while (ReadMessages(client, messages))
+ bool closeConnection = false;
+ while (closeConnection == false)
{
- bool closeConnection = false;
+ std::vector<std::string> messages;
+ if (ReadMessages(client, messages) == false)
+ break;
+
+ std::list<std::string> headers;
for (std::vector<std::string>::const_iterator m = messages.begin();
m != messages.end() && closeConnection == false; ++m) {
+ // if we announced a closing in previous response, do the close now
+ if (std::find(headers.begin(), headers.end(), std::string("Connection: close")) != headers.end())
+ {
+ closeConnection = true;
+ break;
+ }
+ headers.clear();
+
std::clog << ">>> REQUEST from " << client << " >>>" << std::endl << *m
<< std::endl << "<<<<<<<<<<<<<<<<" << std::endl;
- std::list<std::string> headers;
std::string filename;
std::string params;
bool sendContent = true;
- if (parseFirstLine(client, *m, filename, params, sendContent, closeConnection) == false)
+ if (parseFirstLine(client, *m, filename, params, sendContent, closeConnection, headers) == false)
continue;
// special webserver command request
@@ -569,7 +633,7 @@ static void * handleClient(void * voidclient) /*{{{*/
std::vector<std::string> parts = VectorizeString(filename, '/');
if (parts[0] == "_config")
{
- handleOnTheFlyReconfiguration(client, *m, parts);
+ handleOnTheFlyReconfiguration(client, *m, parts, headers);
continue;
}
}
@@ -601,7 +665,7 @@ static void * handleClient(void * voidclient) /*{{{*/
{
char error[300];
regerror(res, pattern, error, sizeof(error));
- sendError(client, 500, *m, sendContent, error);
+ sendError(client, 500, *m, sendContent, error, headers);
continue;
}
if (regexec(pattern, filename.c_str(), 0, 0, 0) == 0)
@@ -620,7 +684,7 @@ static void * handleClient(void * voidclient) /*{{{*/
if (_config->FindB("aptwebserver::support::http", true) == false &&
LookupTag(*m, "Host").find(":4433") == std::string::npos)
{
- sendError(client, 400, *m, sendContent, "HTTP disabled, all requests must be HTTPS");
+ sendError(client, 400, *m, sendContent, "HTTP disabled, all requests must be HTTPS", headers);
continue;
}
else if (RealFileExists(filename) == true)
@@ -667,26 +731,30 @@ static void * handleClient(void * voidclient) /*{{{*/
if (filesize > filestart)
{
data.Skip(filestart);
- std::ostringstream contentlength;
- contentlength << "Content-Length: " << (filesize - filestart);
- headers.push_back(contentlength.str());
+ // make sure to send content-range before conent-length
+ // as regression test for LP: #1445239
std::ostringstream contentrange;
contentrange << "Content-Range: bytes " << filestart << "-"
<< filesize - 1 << "/" << filesize;
headers.push_back(contentrange.str());
+ std::ostringstream contentlength;
+ contentlength << "Content-Length: " << (filesize - filestart);
+ headers.push_back(contentlength.str());
sendHead(client, 206, headers);
if (sendContent == true)
- sendFile(client, data);
+ sendFile(client, headers, data);
continue;
}
else
{
- headers.push_back("Content-Length: 0");
- std::ostringstream contentrange;
- contentrange << "Content-Range: bytes */" << filesize;
- headers.push_back(contentrange.str());
- sendHead(client, 416, headers);
- continue;
+ if (_config->FindB("aptwebserver::support::content-range", true) == true)
+ {
+ std::ostringstream contentrange;
+ contentrange << "Content-Range: bytes */" << filesize;
+ headers.push_back(contentrange.str());
+ }
+ sendError(client, 416, *m, sendContent, "", headers);
+ break;
}
}
}
@@ -695,23 +763,28 @@ static void * handleClient(void * voidclient) /*{{{*/
addFileHeaders(headers, data);
sendHead(client, 200, headers);
if (sendContent == true)
- sendFile(client, data);
+ sendFile(client, headers, data);
}
else if (DirectoryExists(filename) == true)
{
if (filename[filename.length()-1] == '/')
- sendDirectoryListing(client, filename, *m, sendContent);
+ sendDirectoryListing(client, filename, *m, sendContent, headers);
else
sendRedirect(client, 301, filename.append("/"), *m, sendContent);
}
else
- sendError(client, 404, *m, sendContent);
+ sendError(client, 404, *m, sendContent, "", headers);
}
- _error->DumpErrors(std::cerr);
- messages.clear();
- if (closeConnection == true)
+
+ // if we announced a closing in the last response, do the close now
+ if (std::find(headers.begin(), headers.end(), std::string("Connection: close")) != headers.end())
+ closeConnection = true;
+
+ if (_error->PendingError() == true)
break;
+ _error->DumpErrors(std::cerr);
}
+ _error->DumpErrors(std::cerr);
close(client);
std::clog << "CLOSE client " << client << std::endl;
return NULL;
@@ -810,7 +883,8 @@ int main(int const argc, const char * argv[])
std::clog << "Serving ANY file on port: " << port << std::endl;
- int const slaves = _config->FindB("aptwebserver::slaves", SOMAXCONN);
+ int const slaves = _config->FindI("aptwebserver::slaves", SOMAXCONN);
+ std::cerr << "SLAVES: " << slaves << std::endl;
listen(sock, slaves);
/*}}}*/
diff --git a/test/libapt/acqprogress_test.cc b/test/libapt/acqprogress_test.cc
new file mode 100644
index 000000000..dc31423fc
--- /dev/null
+++ b/test/libapt/acqprogress_test.cc
@@ -0,0 +1,178 @@
+#include <config.h>
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/acquire.h>
+#include <apt-pkg/acquire-item.h>
+#include <apt-pkg/configuration.h>
+#include <apt-private/acqprogress.h>
+#include <string>
+#include <sstream>
+#include <gtest/gtest.h>
+
+class TestItem: public pkgAcquire::Item
+{
+public:
+ TestItem(pkgAcquire * const Acq) : pkgAcquire::Item(Acq) {}
+
+ virtual std::string DescURI() const { return ""; }
+ virtual HashStringList GetExpectedHashes() const { return HashStringList(); }
+
+};
+
+TEST(AcqProgress, IMSHit)
+{
+ std::ostringstream out;
+ unsigned int width = 80;
+ AcqTextStatus Stat(out, width, 0);
+ Stat.Start();
+
+ pkgAcquire Acq(&Stat);
+ pkgAcquire::ItemDesc hit;
+ hit.URI = "http://example.org/file";
+ hit.Description = "Example File from example.org";
+ hit.ShortDesc = "Example File";
+ TestItem hitO(&Acq);
+ hit.Owner = &hitO;
+
+ EXPECT_EQ("", out.str());
+ Stat.IMSHit(hit);
+ EXPECT_EQ("Hit:1 Example File from example.org\n", out.str());
+ Stat.IMSHit(hit);
+ EXPECT_EQ("Hit:1 Example File from example.org\n"
+ "Hit:1 Example File from example.org\n", out.str());
+ Stat.Stop();
+ EXPECT_EQ("Hit:1 Example File from example.org\n"
+ "Hit:1 Example File from example.org\n", out.str());
+}
+TEST(AcqProgress, FetchNoFileSize)
+{
+ std::ostringstream out;
+ unsigned int width = 80;
+ AcqTextStatus Stat(out, width, 0);
+ Stat.Start();
+
+ pkgAcquire Acq(&Stat);
+ pkgAcquire::ItemDesc fetch;
+ fetch.URI = "http://example.org/file";
+ fetch.Description = "Example File from example.org";
+ fetch.ShortDesc = "Example File";
+ TestItem fetchO(&Acq);
+ fetch.Owner = &fetchO;
+
+ EXPECT_EQ("", out.str());
+ Stat.Fetch(fetch);
+ EXPECT_EQ("Get:1 Example File from example.org\n", out.str());
+ Stat.Fetch(fetch);
+ EXPECT_EQ("Get:1 Example File from example.org\n"
+ "Get:1 Example File from example.org\n", out.str());
+ Stat.Stop();
+ EXPECT_EQ("Get:1 Example File from example.org\n"
+ "Get:1 Example File from example.org\n", out.str());
+}
+TEST(AcqProgress, FetchFileSize)
+{
+ std::ostringstream out;
+ unsigned int width = 80;
+ AcqTextStatus Stat(out, width, 0);
+ Stat.Start();
+
+ pkgAcquire Acq(&Stat);
+ pkgAcquire::ItemDesc fetch;
+ fetch.URI = "http://example.org/file";
+ fetch.Description = "Example File from example.org";
+ fetch.ShortDesc = "Example File";
+ TestItem fetchO(&Acq);
+ fetchO.FileSize = 100;
+ fetch.Owner = &fetchO;
+
+ EXPECT_EQ("", out.str());
+ Stat.Fetch(fetch);
+ EXPECT_EQ("Get:1 Example File from example.org [100 B]\n", out.str());
+ fetchO.FileSize = 42;
+ Stat.Fetch(fetch);
+ EXPECT_EQ("Get:1 Example File from example.org [100 B]\n"
+ "Get:1 Example File from example.org [42 B]\n", out.str());
+ Stat.Stop();
+ EXPECT_EQ("Get:1 Example File from example.org [100 B]\n"
+ "Get:1 Example File from example.org [42 B]\n", out.str());
+}
+TEST(AcqProgress, Fail)
+{
+ std::ostringstream out;
+ unsigned int width = 80;
+ AcqTextStatus Stat(out, width, 0);
+ Stat.Start();
+
+ pkgAcquire Acq(&Stat);
+ pkgAcquire::ItemDesc fetch;
+ fetch.URI = "http://example.org/file";
+ fetch.Description = "Example File from example.org";
+ fetch.ShortDesc = "Example File";
+ TestItem fetchO(&Acq);
+ fetchO.FileSize = 100;
+ fetchO.Status = pkgAcquire::Item::StatIdle;
+ fetch.Owner = &fetchO;
+
+ EXPECT_EQ("", out.str());
+ Stat.Fail(fetch);
+ EXPECT_EQ("Ign:1 Example File from example.org\n", out.str());
+ fetchO.Status = pkgAcquire::Item::StatDone;
+ Stat.Fail(fetch);
+ EXPECT_EQ("Ign:1 Example File from example.org\n"
+ "Ign:1 Example File from example.org\n", out.str());
+ fetchO.Status = pkgAcquire::Item::StatError;
+ fetchO.ErrorText = "An error test!";
+ Stat.Fail(fetch);
+ EXPECT_EQ("Ign:1 Example File from example.org\n"
+ "Ign:1 Example File from example.org\n"
+ "Err:1 Example File from example.org\n"
+ " An error test!\n", out.str());
+ _config->Set("Acquire::Progress::Ignore::ShowErrorText", true);
+ fetchO.Status = pkgAcquire::Item::StatDone;
+ Stat.Fail(fetch);
+ EXPECT_EQ("Ign:1 Example File from example.org\n"
+ "Ign:1 Example File from example.org\n"
+ "Err:1 Example File from example.org\n"
+ " An error test!\n"
+ "Ign:1 Example File from example.org\n"
+ " An error test!\n", out.str());
+ _config->Set("Acquire::Progress::Ignore::ShowErrorText", true);
+ Stat.Stop();
+ EXPECT_EQ("Ign:1 Example File from example.org\n"
+ "Ign:1 Example File from example.org\n"
+ "Err:1 Example File from example.org\n"
+ " An error test!\n"
+ "Ign:1 Example File from example.org\n"
+ " An error test!\n", out.str());
+}
+TEST(AcqProgress, Pulse)
+{
+ std::ostringstream out;
+ unsigned int width = 80;
+ AcqTextStatus Stat(out, width, 0);
+ _config->Set("APT::Sandbox::User", ""); // ensure we aren't sandboxing
+
+ pkgAcquire Acq(&Stat);
+ pkgAcquire::ItemDesc fetch;
+ fetch.URI = "http://example.org/file";
+ fetch.Description = "Example File from example.org";
+ fetch.ShortDesc = "Example File";
+ TestItem fetchO(&Acq);
+ fetchO.FileSize = 100;
+ fetchO.Status = pkgAcquire::Item::StatFetching;
+ fetch.Owner = &fetchO;
+
+ // make screen smaller and bigger again while running
+ EXPECT_TRUE(Stat.Pulse(&Acq));
+ EXPECT_EQ("\r0% [Working]", out.str());
+ width = 8;
+ EXPECT_TRUE(Stat.Pulse(&Acq));
+ EXPECT_EQ("\r0% [Working]"
+ "\r "
+ "\r0% [Work", out.str());
+ width = 80;
+ EXPECT_TRUE(Stat.Pulse(&Acq));
+ EXPECT_EQ("\r0% [Working]"
+ "\r "
+ "\r0% [Work"
+ "\r0% [Working]", out.str());
+}
diff --git a/test/libapt/cdrom_test.cc b/test/libapt/cdrom_test.cc
index 5cf3b353c..7257eaf1b 100644
--- a/test/libapt/cdrom_test.cc
+++ b/test/libapt/cdrom_test.cc
@@ -109,6 +109,7 @@ TEST(CDROMTest, FindMountPointForDevice)
EXPECT_EQ("/boot/efi", FindMountPointForDevice("/dev/sda1"));
EXPECT_EQ("/tmp", FindMountPointForDevice("tmpfs"));
- unlink(tempfile);
+ if (tempfile != NULL)
+ unlink(tempfile);
free(tempfile);
}
diff --git a/test/libapt/fileutl_test.cc b/test/libapt/fileutl_test.cc
index 8d47c5098..a2c303768 100644
--- a/test/libapt/fileutl_test.cc
+++ b/test/libapt/fileutl_test.cc
@@ -53,11 +53,16 @@ static void TestFileFd(mode_t const a_umask, mode_t const ExpectedFilePermission
// ensure the memory is as predictably messed up
#define APT_INIT_READBACK \
char readback[20]; \
- memset(readback, 'D', sizeof(readback)/sizeof(readback[0])); \
+ memset(readback, 'D', sizeof(readback)*sizeof(readback[0])); \
readback[19] = '\0';
#define EXPECT_N_STR(expect, actual) \
EXPECT_EQ(0, strncmp(expect, actual, strlen(expect)));
-
+ {
+ APT_INIT_READBACK
+ char const * const expect = "DDDDDDDDDDDDDDDDDDD";
+ EXPECT_STREQ(expect,readback);
+ EXPECT_N_STR(expect, readback);
+ }
{
APT_INIT_READBACK
char const * const expect = "This";
@@ -247,37 +252,40 @@ TEST(FileUtlTest, Popen)
// output something
const char* Args[10] = {"/bin/echo", "meepmeep", NULL};
- bool res = Popen(Args, Fd, Child, FileFd::ReadOnly);
- Fd.Read(buf, sizeof(buf)-1, &n);
+ EXPECT_TRUE(Popen(Args, Fd, Child, FileFd::ReadOnly));
+ EXPECT_TRUE(Fd.Read(buf, sizeof(buf)-1, &n));
buf[n] = 0;
EXPECT_NE(n, 0);
- EXPECT_EQ(res, true);
EXPECT_STREQ(buf, "meepmeep\n");
// wait for the child to exit and cleanup
- ExecWait(Child, "PopenRead");
- Fd.Close();
+ EXPECT_TRUE(ExecWait(Child, "PopenRead"));
+ EXPECT_TRUE(Fd.Close());
// ensure that after a close all is good again
if(FileExists("/proc/self/fd"))
EXPECT_EQ(Glob("/proc/self/fd/*").size(), OpenFds.size());
-
// ReadWrite is not supported
- res = Popen(Args, Fd, Child, FileFd::ReadWrite);
- EXPECT_EQ(res, false);
- _error->Discard();
+ _error->PushToStack();
+ EXPECT_FALSE(Popen(Args, Fd, Child, FileFd::ReadWrite));
+ EXPECT_FALSE(Fd.IsOpen());
+ EXPECT_FALSE(Fd.Failed());
+ EXPECT_TRUE(_error->PendingError());
+ _error->RevertToStack();
// write something
Args[0] = "/bin/bash";
Args[1] = "-c";
Args[2] = "read";
Args[3] = NULL;
- res = Popen(Args, Fd, Child, FileFd::WriteOnly);
+ EXPECT_TRUE(Popen(Args, Fd, Child, FileFd::WriteOnly));
s = "\n";
- Fd.Write(s.c_str(), s.size());
- Fd.Close();
- ExecWait(Child, "PopenWrite");
+ EXPECT_TRUE(Fd.Write(s.c_str(), s.length()));
+ EXPECT_TRUE(Fd.Close());
+ EXPECT_FALSE(Fd.IsOpen());
+ EXPECT_FALSE(Fd.Failed());
+ EXPECT_TRUE(ExecWait(Child, "PopenWrite"));
}
TEST(FileUtlTest, flAbsPath)
{
diff --git a/test/libapt/hashsums_test.cc b/test/libapt/hashsums_test.cc
index a19a0befd..63c63ecd3 100644
--- a/test/libapt/hashsums_test.cc
+++ b/test/libapt/hashsums_test.cc
@@ -194,6 +194,30 @@ TEST(HashSumsTest, FileBased)
}
fd.Seek(0);
{
+ Hashes hashes(Hashes::MD5SUM | Hashes::SHA512SUM);
+ hashes.AddFD(fd);
+ HashStringList list = hashes.GetHashStringList();
+ EXPECT_FALSE(list.empty());
+ EXPECT_EQ(3, list.size());
+ EXPECT_EQ(md5.Value(), list.find("MD5Sum")->HashValue());
+ EXPECT_EQ(NULL, list.find("SHA1"));
+ EXPECT_EQ(NULL, list.find("SHA256"));
+ EXPECT_EQ(sha512.Value(), list.find("SHA512")->HashValue());
+ EXPECT_EQ(FileSize, list.find("Checksum-FileSize")->HashValue());
+ fd.Seek(0);
+ Hashes hashes2(list);
+ hashes2.AddFD(fd);
+ list = hashes2.GetHashStringList();
+ EXPECT_FALSE(list.empty());
+ EXPECT_EQ(3, list.size());
+ EXPECT_EQ(md5.Value(), list.find("MD5Sum")->HashValue());
+ EXPECT_EQ(NULL, list.find("SHA1"));
+ EXPECT_EQ(NULL, list.find("SHA256"));
+ EXPECT_EQ(sha512.Value(), list.find("SHA512")->HashValue());
+ EXPECT_EQ(FileSize, list.find("Checksum-FileSize")->HashValue());
+ }
+ fd.Seek(0);
+ {
MD5Summation MD5;
MD5.AddFD(fd.Fd());
EXPECT_EQ(md5.Value(), MD5.Result().Value());
@@ -282,6 +306,7 @@ TEST(HashSumsTest, HashStringList)
EXPECT_EQ(NULL, list.find(NULL));
EXPECT_EQ(NULL, list.find(""));
EXPECT_EQ(NULL, list.find("MD5Sum"));
+ EXPECT_EQ(0, list.FileSize());
// empty lists aren't equal
HashStringList list2;
@@ -292,6 +317,8 @@ TEST(HashSumsTest, HashStringList)
list.push_back(HashString("Checksum-FileSize", "29"));
EXPECT_FALSE(list.empty());
EXPECT_FALSE(list.usable());
+ EXPECT_EQ(1, list.size());
+ EXPECT_EQ(29, list.FileSize());
Hashes hashes;
hashes.Add("The quick brown fox jumps over the lazy dog");
diff --git a/test/libapt/indexcopytosourcelist_test.cc b/test/libapt/indexcopytosourcelist_test.cc
index bec87601f..1b0427564 100644
--- a/test/libapt/indexcopytosourcelist_test.cc
+++ b/test/libapt/indexcopytosourcelist_test.cc
@@ -16,7 +16,7 @@ class NoCopy : public IndexCopy {
return Path;
}
bool GetFile(std::string &/*Filename*/, unsigned long long &/*Size*/) { return false; }
- bool RewriteEntry(FILE * /*Target*/, std::string /*File*/) { return false; }
+ bool RewriteEntry(FileFd & /*Target*/, std::string const &/*File*/) { return false; }
const char *GetFileName() { return NULL; }
const char *Type() { return NULL; }
diff --git a/test/libapt/makefile b/test/libapt/makefile
index 7f23ace46..61a8aaf31 100644
--- a/test/libapt/makefile
+++ b/test/libapt/makefile
@@ -8,6 +8,7 @@ APT_DOMAIN=none
include ../../buildlib/defaults.mak
.PHONY: test
+ifeq (file-okay,$(shell $(CC) -I $(BASE)/build/include -M gtest_runner.cc >/dev/null 2>&1 && echo 'file-okay'))
test: $(BIN)/gtest$(BASENAME)
MALLOC_PERTURB_=21 MALLOC_CHECK_=2 LD_LIBRARY_PATH=$(LIB) $(BIN)/gtest$(BASENAME)
@@ -71,3 +72,12 @@ $(LIB)/gtest.a: $(OBJ)/gtest-all.o
echo Building static library $@
-rm -f $@
$(AR) $(ARFLAGS) $@ $^
+
+else
+test:
+ @echo "APT uses Googles C++ testing framework for its unit tests"
+ @echo "On Debian systems this is available in the 'libgtest-dev' package."
+ @echo "Please install it before attempting to run the unit tests."
+ $(CC) -I $(BASE)/build/include -M gtest_runner.cc
+ exit 100
+endif
diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc
index eb2d76c43..747ab4957 100644
--- a/test/libapt/sourcelist_test.cc
+++ b/test/libapt/sourcelist_test.cc
@@ -20,7 +20,7 @@ class SourceList : public pkgSourceList {
TEST(SourceListTest,ParseFileDeb822)
{
FileFd fd;
- char * tempfile;
+ char * tempfile = NULL;
createTemporaryFile("parsefiledeb822", fd, &tempfile,
"Types: deb\n"
"URIs: http://ftp.debian.org/debian\n"
diff --git a/test/libapt/strutil_test.cc b/test/libapt/strutil_test.cc
index 9bc3c76fd..23dc08727 100644
--- a/test/libapt/strutil_test.cc
+++ b/test/libapt/strutil_test.cc
@@ -97,6 +97,28 @@ TEST(StrUtilTest,StartsWith)
EXPECT_FALSE(Startswith("abcd", "x"));
EXPECT_FALSE(Startswith("abcd", "abcndefg"));
}
+TEST(StrUtilTest,TimeToStr)
+{
+ EXPECT_EQ("0s", TimeToStr(0));
+ EXPECT_EQ("42s", TimeToStr(42));
+ EXPECT_EQ("9min 21s", TimeToStr((9*60) + 21));
+ EXPECT_EQ("20min 42s", TimeToStr((20*60) + 42));
+ EXPECT_EQ("10h 42min 21s", TimeToStr((10*3600) + (42*60) + 21));
+ EXPECT_EQ("10h 42min 21s", TimeToStr((10*3600) + (42*60) + 21));
+ EXPECT_EQ("1988d 3h 29min 7s", TimeToStr((1988*86400) + (3*3600) + (29*60) + 7));
+
+ EXPECT_EQ("59s", TimeToStr(59));
+ EXPECT_EQ("60s", TimeToStr(60));
+ EXPECT_EQ("1min 1s", TimeToStr(61));
+ EXPECT_EQ("59min 59s", TimeToStr(3599));
+ EXPECT_EQ("60min 0s", TimeToStr(3600));
+ EXPECT_EQ("1h 0min 1s", TimeToStr(3601));
+ EXPECT_EQ("1h 1min 0s", TimeToStr(3660));
+ EXPECT_EQ("23h 59min 59s", TimeToStr(86399));
+ EXPECT_EQ("24h 0min 0s", TimeToStr(86400));
+ EXPECT_EQ("1d 0h 0min 1s", TimeToStr(86401));
+ EXPECT_EQ("1d 0h 1min 0s", TimeToStr(86460));
+}
TEST(StrUtilTest,SubstVar)
{
EXPECT_EQ("", SubstVar("", "fails", "passes"));
diff --git a/test/libapt/tagfile_test.cc b/test/libapt/tagfile_test.cc
index df618ea16..d7030f41a 100644
--- a/test/libapt/tagfile_test.cc
+++ b/test/libapt/tagfile_test.cc
@@ -34,6 +34,12 @@ TEST(TagFileTest,SingleField)
EXPECT_FALSE(section.Exists("FieldB-12345678"));
// There is only one section in this tag file
EXPECT_FALSE(tfile.Step(section));
+
+ // Now we scan an empty section to test reset
+ ASSERT_TRUE(section.Scan("\n\n", 2, true));
+ EXPECT_EQ(0, section.Count());
+ EXPECT_FALSE(section.Exists("FieldA-12345678"));
+ EXPECT_FALSE(section.Exists("FieldB-12345678"));
}
TEST(TagFileTest,MultipleSections)
diff --git a/test/libapt/tagsection_test.cc b/test/libapt/tagsection_test.cc
new file mode 100644
index 000000000..f250177af
--- /dev/null
+++ b/test/libapt/tagsection_test.cc
@@ -0,0 +1,270 @@
+#include <config.h>
+
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/tagfile.h>
+
+#include <string>
+#include <sstream>
+
+#include <gtest/gtest.h>
+
+#include "file-helpers.h"
+
+std::string packageValue = "aaaa";
+std::string typoValue = "aa\n"
+ " .\n"
+ " cc";
+std::string typoRawValue = "\n " + typoValue;
+std::string overrideValue = "1";
+/*
+ std::cerr << "FILECONTENT: »";
+ char buffer[3000];
+ while (fd.ReadLine(buffer, sizeof(buffer)))
+ std::cerr << buffer;
+ std::cerr << "«" << std::endl;;
+*/
+
+void setupTestcaseStart(FileFd &fd, pkgTagSection &section, std::string &content)
+{
+ createTemporaryFile("writesection", fd, NULL, NULL);
+ content = "Package: " + packageValue + "\n"
+ "TypoA:\n " + typoValue + "\n"
+ "Override: " + overrideValue + "\n"
+ "Override-Backup: " + overrideValue + "\n"
+ "\n";
+ EXPECT_TRUE(section.Scan(content.c_str(), content.length(), true));
+ EXPECT_TRUE(section.Exists("Package"));
+ EXPECT_TRUE(section.Exists("TypoA"));
+ EXPECT_TRUE(section.Exists("Override"));
+ EXPECT_TRUE(section.Exists("Override-Backup"));
+ EXPECT_FALSE(section.Exists("TypoB"));
+ EXPECT_EQ(packageValue, section.FindS("Package"));
+ EXPECT_EQ(typoValue, section.FindS("TypoA"));
+ EXPECT_EQ(typoRawValue, section.FindRawS("TypoA"));
+ EXPECT_EQ(1, section.FindI("Override"));
+ EXPECT_EQ(1, section.FindI("Override-Backup"));
+ EXPECT_EQ(4, section.Count());
+}
+TEST(TagSectionTest,WriteUnmodified)
+{
+ FileFd fd;
+ pkgTagSection section;
+ std::string content;
+ setupTestcaseStart(fd, section, content);
+ EXPECT_TRUE(section.Write(fd));
+ EXPECT_TRUE(fd.Seek(0));
+ pkgTagFile tfile(&fd);
+ ASSERT_TRUE(tfile.Step(section));
+ EXPECT_TRUE(section.Exists("Package"));
+ EXPECT_TRUE(section.Exists("TypoA"));
+ EXPECT_TRUE(section.Exists("Override"));
+ EXPECT_TRUE(section.Exists("Override-Backup"));
+ EXPECT_FALSE(section.Exists("TypoB"));
+ EXPECT_EQ(packageValue, section.FindS("Package"));
+ EXPECT_EQ(typoValue, section.FindS("TypoA"));
+ EXPECT_EQ(1, section.FindI("Override"));
+ EXPECT_EQ(1, section.FindI("Override-Backup"));
+ EXPECT_EQ(4, section.Count());
+}
+TEST(TagSectionTest,WriteUnmodifiedOrder)
+{
+ FileFd fd;
+ pkgTagSection section;
+ std::string content;
+ setupTestcaseStart(fd, section, content);
+ char const * const order[] = { "Package", "TypoA", "Override", NULL };
+ EXPECT_TRUE(section.Write(fd, order));
+ EXPECT_TRUE(fd.Seek(0));
+ pkgTagFile tfile(&fd);
+ ASSERT_TRUE(tfile.Step(section));
+ EXPECT_TRUE(section.Exists("Package"));
+ EXPECT_TRUE(section.Exists("TypoA"));
+ EXPECT_TRUE(section.Exists("Override"));
+ EXPECT_TRUE(section.Exists("Override-Backup"));
+ EXPECT_FALSE(section.Exists("TypoB"));
+ EXPECT_EQ(packageValue, section.FindS("Package"));
+ EXPECT_EQ(typoValue, section.FindS("TypoA"));
+ EXPECT_EQ(1, section.FindI("Override"));
+ EXPECT_EQ(1, section.FindI("Override-Backup"));
+ EXPECT_EQ(4, section.Count());
+}
+TEST(TagSectionTest,WriteUnmodifiedOrderReversed)
+{
+ FileFd fd;
+ pkgTagSection section;
+ std::string content;
+ setupTestcaseStart(fd, section, content);
+ char const * const order[] = { "Override", "TypoA", "Package", NULL };
+ EXPECT_TRUE(section.Write(fd, order));
+ EXPECT_TRUE(fd.Seek(0));
+ pkgTagFile tfile(&fd);
+ ASSERT_TRUE(tfile.Step(section));
+ EXPECT_TRUE(section.Exists("Package"));
+ EXPECT_TRUE(section.Exists("TypoA"));
+ EXPECT_TRUE(section.Exists("Override"));
+ EXPECT_TRUE(section.Exists("Override-Backup"));
+ EXPECT_FALSE(section.Exists("TypoB"));
+ EXPECT_EQ(packageValue, section.FindS("Package"));
+ EXPECT_EQ(typoValue, section.FindS("TypoA"));
+ EXPECT_EQ(1, section.FindI("Override"));
+ EXPECT_EQ(1, section.FindI("Override-Backup"));
+ EXPECT_EQ(4, section.Count());
+}
+TEST(TagSectionTest,WriteUnmodifiedOrderNotAll)
+{
+ FileFd fd;
+ pkgTagSection section;
+ std::string content;
+ setupTestcaseStart(fd, section, content);
+ char const * const order[] = { "Override", NULL };
+ EXPECT_TRUE(section.Write(fd, order));
+ EXPECT_TRUE(fd.Seek(0));
+ pkgTagFile tfile(&fd);
+ ASSERT_TRUE(tfile.Step(section));
+ EXPECT_TRUE(section.Exists("Package"));
+ EXPECT_TRUE(section.Exists("TypoA"));
+ EXPECT_TRUE(section.Exists("Override"));
+ EXPECT_TRUE(section.Exists("Override-Backup"));
+ EXPECT_FALSE(section.Exists("TypoB"));
+ EXPECT_EQ(packageValue, section.FindS("Package"));
+ EXPECT_EQ(typoValue, section.FindS("TypoA"));
+ EXPECT_EQ(1, section.FindI("Override"));
+ EXPECT_EQ(1, section.FindI("Override-Backup"));
+ EXPECT_EQ(4, section.Count());
+}
+TEST(TagSectionTest,WriteNoOrderRename)
+{
+ FileFd fd;
+ pkgTagSection section;
+ std::string content;
+ setupTestcaseStart(fd, section, content);
+ std::vector<pkgTagSection::Tag> rewrite;
+ rewrite.push_back(pkgTagSection::Tag::Rename("TypoA", "TypoB"));
+ EXPECT_TRUE(section.Write(fd, NULL, rewrite));
+ EXPECT_TRUE(fd.Seek(0));
+ pkgTagFile tfile(&fd);
+ ASSERT_TRUE(tfile.Step(section));
+ EXPECT_TRUE(section.Exists("Package"));
+ EXPECT_FALSE(section.Exists("TypoA"));
+ EXPECT_TRUE(section.Exists("TypoB"));
+ EXPECT_TRUE(section.Exists("Override"));
+ EXPECT_TRUE(section.Exists("Override-Backup"));
+ EXPECT_EQ(packageValue, section.FindS("Package"));
+ EXPECT_EQ(typoValue, section.FindS("TypoB"));
+ EXPECT_EQ(1, section.FindI("Override"));
+ EXPECT_EQ(1, section.FindI("Override-Backup"));
+ EXPECT_EQ(4, section.Count());
+}
+TEST(TagSectionTest,WriteNoOrderRemove)
+{
+ FileFd fd;
+ pkgTagSection section;
+ std::string content;
+ setupTestcaseStart(fd, section, content);
+ std::vector<pkgTagSection::Tag> rewrite;
+ rewrite.push_back(pkgTagSection::Tag::Remove("TypoA"));
+ rewrite.push_back(pkgTagSection::Tag::Rewrite("Override", ""));
+ EXPECT_TRUE(section.Write(fd, NULL, rewrite));
+ EXPECT_TRUE(fd.Seek(0));
+ pkgTagFile tfile(&fd);
+ ASSERT_TRUE(tfile.Step(section));
+ EXPECT_TRUE(section.Exists("Package"));
+ EXPECT_FALSE(section.Exists("TypoA"));
+ EXPECT_FALSE(section.Exists("TypoB"));
+ EXPECT_FALSE(section.Exists("Override"));
+ EXPECT_TRUE(section.Exists("Override-Backup"));
+ EXPECT_EQ(packageValue, section.FindS("Package"));
+ EXPECT_EQ(2, section.Count());
+}
+TEST(TagSectionTest,WriteNoOrderRewrite)
+{
+ FileFd fd;
+ pkgTagSection section;
+ std::string content;
+ setupTestcaseStart(fd, section, content);
+ std::vector<pkgTagSection::Tag> rewrite;
+ rewrite.push_back(pkgTagSection::Tag::Rewrite("Override", "42"));
+ EXPECT_TRUE(section.Write(fd, NULL, rewrite));
+ EXPECT_TRUE(fd.Seek(0));
+ pkgTagFile tfile(&fd);
+ ASSERT_TRUE(tfile.Step(section));
+ EXPECT_TRUE(section.Exists("Package"));
+ EXPECT_TRUE(section.Exists("TypoA"));
+ EXPECT_FALSE(section.Exists("TypoB"));
+ EXPECT_TRUE(section.Exists("Override"));
+ EXPECT_TRUE(section.Exists("Override-Backup"));
+ EXPECT_EQ(packageValue, section.FindS("Package"));
+ EXPECT_EQ(42, section.FindI("Override"));
+ EXPECT_EQ(1, section.FindI("Override-Backup"));
+ EXPECT_EQ(4, section.Count());
+}
+TEST(TagSectionTest,WriteOrderRename)
+{
+ FileFd fd;
+ pkgTagSection section;
+ std::string content;
+ setupTestcaseStart(fd, section, content);
+ std::vector<pkgTagSection::Tag> rewrite;
+ rewrite.push_back(pkgTagSection::Tag::Rename("TypoA", "TypoB"));
+ char const * const order[] = { "Package", "TypoA", "Override", NULL };
+ EXPECT_TRUE(section.Write(fd, order, rewrite));
+ EXPECT_TRUE(fd.Seek(0));
+ pkgTagFile tfile(&fd);
+ ASSERT_TRUE(tfile.Step(section));
+ EXPECT_TRUE(section.Exists("Package"));
+ EXPECT_FALSE(section.Exists("TypoA"));
+ EXPECT_TRUE(section.Exists("TypoB"));
+ EXPECT_TRUE(section.Exists("Override"));
+ EXPECT_TRUE(section.Exists("Override-Backup"));
+ EXPECT_EQ(packageValue, section.FindS("Package"));
+ EXPECT_EQ(typoValue, section.FindS("TypoB"));
+ EXPECT_EQ(1, section.FindI("Override"));
+ EXPECT_EQ(1, section.FindI("Override-Backup"));
+ EXPECT_EQ(4, section.Count());
+}
+TEST(TagSectionTest,WriteOrderRemove)
+{
+ FileFd fd;
+ pkgTagSection section;
+ std::string content;
+ setupTestcaseStart(fd, section, content);
+ std::vector<pkgTagSection::Tag> rewrite;
+ rewrite.push_back(pkgTagSection::Tag::Remove("TypoA"));
+ rewrite.push_back(pkgTagSection::Tag::Rewrite("Override", ""));
+ char const * const order[] = { "Package", "TypoA", "Override", NULL };
+ EXPECT_TRUE(section.Write(fd, order, rewrite));
+ EXPECT_TRUE(fd.Seek(0));
+ pkgTagFile tfile(&fd);
+ ASSERT_TRUE(tfile.Step(section));
+ EXPECT_TRUE(section.Exists("Package"));
+ EXPECT_FALSE(section.Exists("TypoA"));
+ EXPECT_FALSE(section.Exists("TypoB"));
+ EXPECT_FALSE(section.Exists("Override"));
+ EXPECT_TRUE(section.Exists("Override-Backup"));
+ EXPECT_EQ(packageValue, section.FindS("Package"));
+ EXPECT_EQ(1, section.FindI("Override-Backup"));
+ EXPECT_EQ(2, section.Count());
+}
+TEST(TagSectionTest,WriteOrderRewrite)
+{
+ FileFd fd;
+ pkgTagSection section;
+ std::string content;
+ setupTestcaseStart(fd, section, content);
+ std::vector<pkgTagSection::Tag> rewrite;
+ rewrite.push_back(pkgTagSection::Tag::Rewrite("Override", "42"));
+ char const * const order[] = { "Package", "TypoA", "Override", NULL };
+ EXPECT_TRUE(section.Write(fd, order, rewrite));
+ EXPECT_TRUE(fd.Seek(0));
+ pkgTagFile tfile(&fd);
+ ASSERT_TRUE(tfile.Step(section));
+ EXPECT_TRUE(section.Exists("Package"));
+ EXPECT_TRUE(section.Exists("TypoA"));
+ EXPECT_FALSE(section.Exists("TypoB"));
+ EXPECT_TRUE(section.Exists("Override"));
+ EXPECT_TRUE(section.Exists("Override-Backup"));
+ EXPECT_EQ(packageValue, section.FindS("Package"));
+ EXPECT_EQ(42, section.FindI("Override"));
+ EXPECT_EQ(1, section.FindI("Override-Backup"));
+ EXPECT_EQ(4, section.Count());
+}
diff --git a/test/libapt/uri_test.cc b/test/libapt/uri_test.cc
index 1662f51f0..fe6015e65 100644
--- a/test/libapt/uri_test.cc
+++ b/test/libapt/uri_test.cc
@@ -12,6 +12,10 @@ TEST(URITest, BasicHTTP)
EXPECT_EQ(90, U.Port);
EXPECT_EQ("www.debian.org", U.Host);
EXPECT_EQ("/temp/test", U.Path);
+ EXPECT_EQ("http://www.debian.org:90/temp/test", (std::string)U);
+ EXPECT_EQ("http://www.debian.org:90", URI::SiteOnly(U));
+ EXPECT_EQ("http://www.debian.org:90/temp/test", URI::ArchiveOnly(U));
+ EXPECT_EQ("http://www.debian.org:90/temp/test", URI::NoUserPassword(U));
// Login data
U = URI("http://jgg:foo@ualberta.ca/blah");
EXPECT_EQ("http", U.Access);
@@ -20,6 +24,10 @@ TEST(URITest, BasicHTTP)
EXPECT_EQ(0, U.Port);
EXPECT_EQ("ualberta.ca", U.Host);
EXPECT_EQ("/blah", U.Path);
+ EXPECT_EQ("http://jgg:foo@ualberta.ca/blah", (std::string)U);
+ EXPECT_EQ("http://ualberta.ca", URI::SiteOnly(U));
+ EXPECT_EQ("http://ualberta.ca/blah", URI::ArchiveOnly(U));
+ EXPECT_EQ("http://ualberta.ca/blah", URI::NoUserPassword(U));
}
TEST(URITest, SingeSlashFile)
{
@@ -30,6 +38,10 @@ TEST(URITest, SingeSlashFile)
EXPECT_EQ(0, U.Port);
EXPECT_EQ("", U.Host);
EXPECT_EQ("/usr/bin/foo", U.Path);
+ EXPECT_EQ("file:/usr/bin/foo", (std::string)U);
+ EXPECT_EQ("file:", URI::SiteOnly(U));
+ EXPECT_EQ("file:/usr/bin/foo", URI::ArchiveOnly(U));
+ EXPECT_EQ("file:/usr/bin/foo", URI::NoUserPassword(U));
}
TEST(URITest, BasicCDROM)
{
@@ -40,6 +52,10 @@ TEST(URITest, BasicCDROM)
EXPECT_EQ(0, U.Port);
EXPECT_EQ("Moo Cow Rom", U.Host);
EXPECT_EQ("/debian", U.Path);
+ EXPECT_EQ("cdrom://Moo Cow Rom/debian", (std::string)U);
+ EXPECT_EQ("cdrom://Moo Cow Rom", URI::SiteOnly(U));
+ EXPECT_EQ("cdrom://Moo Cow Rom/debian", URI::ArchiveOnly(U));
+ EXPECT_EQ("cdrom://Moo Cow Rom/debian", URI::NoUserPassword(U));
}
TEST(URITest, RelativeGzip)
{
@@ -50,6 +66,10 @@ TEST(URITest, RelativeGzip)
EXPECT_EQ(0, U.Port);
EXPECT_EQ(".", U.Host);
EXPECT_EQ("/bar/cow", U.Path);
+ EXPECT_EQ("gzip://./bar/cow", (std::string)U);
+ EXPECT_EQ("gzip://.", URI::SiteOnly(U));
+ EXPECT_EQ("gzip://./bar/cow", URI::ArchiveOnly(U));
+ EXPECT_EQ("gzip://./bar/cow", URI::NoUserPassword(U));
}
TEST(URITest, NoSlashFTP)
{
@@ -60,6 +80,10 @@ TEST(URITest, NoSlashFTP)
EXPECT_EQ(0, U.Port);
EXPECT_EQ("ftp.fr.debian.org", U.Host);
EXPECT_EQ("/debian/pool/main/x/xtel/xtel_3.2.1-15_i386.deb", U.Path);
+ EXPECT_EQ("ftp://ftp.fr.debian.org/debian/pool/main/x/xtel/xtel_3.2.1-15_i386.deb", (std::string)U);
+ EXPECT_EQ("ftp://ftp.fr.debian.org", URI::SiteOnly(U));
+ EXPECT_EQ("ftp://ftp.fr.debian.org/debian/pool/main/x/xtel/xtel_3.2.1-15_i386.deb", URI::ArchiveOnly(U));
+ EXPECT_EQ("ftp://ftp.fr.debian.org/debian/pool/main/x/xtel/xtel_3.2.1-15_i386.deb", URI::NoUserPassword(U));
}
TEST(URITest, RFC2732)
{
@@ -70,6 +94,10 @@ TEST(URITest, RFC2732)
EXPECT_EQ(0, U.Port);
EXPECT_EQ("1080::8:800:200C:417A", U.Host);
EXPECT_EQ("/foo", U.Path);
+ EXPECT_EQ("http://[1080::8:800:200C:417A]/foo", (std::string)U);
+ EXPECT_EQ("http://[1080::8:800:200C:417A]", URI::SiteOnly(U));
+ EXPECT_EQ("http://[1080::8:800:200C:417A]/foo", URI::ArchiveOnly(U));
+ EXPECT_EQ("http://[1080::8:800:200C:417A]/foo", URI::NoUserPassword(U));
// with port
U = URI("http://[::FFFF:129.144.52.38]:80/index.html");
EXPECT_EQ("http", U.Access);
@@ -78,6 +106,10 @@ TEST(URITest, RFC2732)
EXPECT_EQ(80, U.Port);
EXPECT_EQ("::FFFF:129.144.52.38", U.Host);
EXPECT_EQ("/index.html", U.Path);
+ EXPECT_EQ("http://[::FFFF:129.144.52.38]:80/index.html", (std::string)U);
+ EXPECT_EQ("http://[::FFFF:129.144.52.38]:80", URI::SiteOnly(U));
+ EXPECT_EQ("http://[::FFFF:129.144.52.38]:80/index.html", URI::ArchiveOnly(U));
+ EXPECT_EQ("http://[::FFFF:129.144.52.38]:80/index.html", URI::NoUserPassword(U));
// extra colon
U = URI("http://[::FFFF:129.144.52.38:]:80/index.html");
EXPECT_EQ("http", U.Access);
@@ -86,6 +118,10 @@ TEST(URITest, RFC2732)
EXPECT_EQ(80, U.Port);
EXPECT_EQ("::FFFF:129.144.52.38:", U.Host);
EXPECT_EQ("/index.html", U.Path);
+ EXPECT_EQ("http://[::FFFF:129.144.52.38:]:80/index.html", (std::string)U);
+ EXPECT_EQ("http://[::FFFF:129.144.52.38:]:80", URI::SiteOnly(U));
+ EXPECT_EQ("http://[::FFFF:129.144.52.38:]:80/index.html", URI::ArchiveOnly(U));
+ EXPECT_EQ("http://[::FFFF:129.144.52.38:]:80/index.html", URI::NoUserPassword(U));
// extra colon port
U = URI("http://[::FFFF:129.144.52.38:]/index.html");
EXPECT_EQ("http", U.Access);
@@ -94,6 +130,10 @@ TEST(URITest, RFC2732)
EXPECT_EQ(0, U.Port);
EXPECT_EQ("::FFFF:129.144.52.38:", U.Host);
EXPECT_EQ("/index.html", U.Path);
+ EXPECT_EQ("http://[::FFFF:129.144.52.38:]/index.html", (std::string)U);
+ EXPECT_EQ("http://[::FFFF:129.144.52.38:]", URI::SiteOnly(U));
+ EXPECT_EQ("http://[::FFFF:129.144.52.38:]/index.html", URI::ArchiveOnly(U));
+ EXPECT_EQ("http://[::FFFF:129.144.52.38:]/index.html", URI::NoUserPassword(U));
// My Evil Corruption of RFC 2732 to handle CDROM names!
// Fun for the whole family! */
U = URI("cdrom:[The Debian 1.2 disk, 1/2 R1:6]/debian/");
@@ -103,6 +143,10 @@ TEST(URITest, RFC2732)
EXPECT_EQ(0, U.Port);
EXPECT_EQ("The Debian 1.2 disk, 1/2 R1:6", U.Host);
EXPECT_EQ("/debian/", U.Path);
+ EXPECT_EQ("cdrom://[The Debian 1.2 disk, 1/2 R1:6]/debian/", (std::string)U);
+ EXPECT_EQ("cdrom://[The Debian 1.2 disk, 1/2 R1:6]", URI::SiteOnly(U));
+ EXPECT_EQ("cdrom://[The Debian 1.2 disk, 1/2 R1:6]/debian", URI::ArchiveOnly(U));
+ EXPECT_EQ("cdrom://[The Debian 1.2 disk, 1/2 R1:6]/debian/", URI::NoUserPassword(U));
// no brackets
U = URI("cdrom:Foo Bar Cow/debian/");
EXPECT_EQ("cdrom", U.Access);
@@ -111,9 +155,16 @@ TEST(URITest, RFC2732)
EXPECT_EQ(0, U.Port);
EXPECT_EQ("Foo Bar Cow", U.Host);
EXPECT_EQ("/debian/", U.Path);
+ EXPECT_EQ("cdrom://Foo Bar Cow/debian/", (std::string)U);
+ EXPECT_EQ("cdrom://Foo Bar Cow", URI::SiteOnly(U));
+ EXPECT_EQ("cdrom://Foo Bar Cow/debian", URI::ArchiveOnly(U));
+ EXPECT_EQ("cdrom://Foo Bar Cow/debian/", URI::NoUserPassword(U));
// percent encoded
U = URI("ftp://foo:b%40r@example.org");
EXPECT_EQ("foo", U.User);
EXPECT_EQ("b@r", U.Password);
EXPECT_EQ("ftp://foo:b%40r@example.org/", (std::string) U);
+ EXPECT_EQ("ftp://example.org", URI::SiteOnly(U));
+ EXPECT_EQ("ftp://example.org", URI::ArchiveOnly(U));
+ EXPECT_EQ("ftp://example.org/", URI::NoUserPassword(U));
}
diff --git a/vendor/ubuntu/apt.conf-01-vendor-ubuntu b/vendor/ubuntu/apt.conf-01-vendor-ubuntu
index c4092ff44..e69de29bb 100644
--- a/vendor/ubuntu/apt.conf-01-vendor-ubuntu
+++ b/vendor/ubuntu/apt.conf-01-vendor-ubuntu
@@ -1,6 +0,0 @@
-// Server information for apt-changelog
-APT {
- Changelogs {
- Server "http://changelogs.ubuntu.com/changelogs";
- };
-};